Merge branch 'main' into IAC-778-backup-on-clean-environment-throws-e…

…xception

backup of all package version

LICENSE.txt

@@ -1,17 +1,17 @@
-Build Tools for VMware Aria
-Copyright 2023 VMware, Inc.
-
-The BSD-2 license (the "License") set forth below applies to all parts of the Build Tools for VMware Aria project. You may not use this file except in compliance with the License.
-
-BSD-2 License 
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
+Build Tools for VMware Aria
+Copyright 2023 VMware, Inc.
+
+The BSD-2 license (the "License") set forth below applies to all parts of the Build Tools for VMware Aria project. You may not use this file except in compliance with the License.
+
+BSD-2 License 
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+

NOTICE.txt

@@ -1,6 +1,6 @@
-Build Tools for VMware Aria
-Copyright 2023 VMware, Inc.
-
-This product is licensed to you under the BSD-2 license (the "License"). You may not use this product except in compliance with the BSD-2 License.  
-
-This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. 
+Build Tools for VMware Aria
+Copyright 2023 VMware, Inc.
+
+This product is licensed to you under the BSD-2 license (the "License"). You may not use this product except in compliance with the BSD-2 License.  
+
+This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. 

common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/VroPackageStore.java

@@ -190,12 +190,15 @@ public final List<Package> importAllPackages(final List<Package> vroPackages, fi
 						}
 					}
 
-					if (samePackagesInDest.size() > 0) {
-						Package highestVersionPac = this.getHighestVersion(samePackagesInDest);
-						String backupFilePath = this.createBackupFilePath(highestVersionPac, currentDateTimeString, backupFilesDirectory);
-						highestVersionPac.setFilesystemPath(backupFilePath);
-						restClient.exportPackage(highestVersionPac, dryrun, exportConfigAttributeValues, exportConfigSecureStringValues);
-
+					if (!samePackagesInDest.isEmpty()) {
+						List<Package> allCurrentPkgVersions = this.getPackages();
+						for (Package eachPkgVersion: allCurrentPkgVersions
+							 ) {
+							String backupFilePath = this.createBackupFilePath(eachPkgVersion, currentDateTimeString, backupFilesDirectory);
+							eachPkgVersion.setFilesystemPath(backupFilePath);
+							restClient.exportPackage(eachPkgVersion, dryrun, exportConfigAttributeValues, exportConfigSecureStringValues);
+						}
+
 					} else {
 						logger.info("The package does not exist in vRO and backup is skipped: ", pkg.getName());
 					}
@@ -388,7 +391,7 @@ private String createBackupFilePath(final Package pkg, final String currentDateT
 		Path fileName = pkgFullPath.getFileName();
         logger.debug("fileName: " + fileName.toString());
 
-		String newFileName = fileName.toString() + "_bak_" + currentDateTimeString;
+		String newFileName = fileName.toString() + ".backup_" + currentDateTimeString;
 		logger.debug("newFileName: " + newFileName);
 
 		String newFullPath = backupDirectoryPath + newFileName;

common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/rest/RestClientVro.java

@@ -201,7 +201,6 @@ public void doWithRequest(ClientHttpRequest request) throws IOException {
             public Void extractData(ClientHttpResponse response) throws IOException {
                 if (!dryrun) {
 					Path path = Paths.get(pkg.getFilesystemPath());
-
 					System.out.println("About to copy the file");
 					System.out.println(path.toString());