Rollback artifactTarget and add targetRepo to json output (#532)

gailazar300 · web-flow · commit d07836f4584f · 2021-07-13T12:14:06.000+03:00
diff --git a/build-info-client/src/main/java/org/jfrog/build/client/DeployableArtifactDetail.java b/build-info-client/src/main/java/org/jfrog/build/client/DeployableArtifactDetail.java
@@ -26,13 +26,18 @@ public class DeployableArtifactDetail implements Serializable {
      * In case of deploy - is the deployment succeeded.
      */
     private Boolean deploySucceeded;
+    /**
+     * Target deployment repository.
+     */
+    private String targetRepository;
 
-    public DeployableArtifactDetail(String artifactSource, String artifactDest, String sha1, String sha256, Boolean deploySucceeded) {
+    public DeployableArtifactDetail(String artifactSource, String artifactDest, String sha1, String sha256, Boolean deploySucceeded, String targetRepository) {
         this.sourcePath = artifactSource;
         this.artifactDest = artifactDest;
         this.sha1 = sha1;
         this.sha256 = sha256;
         this.deploySucceeded = deploySucceeded;
+        this.targetRepository = targetRepository;
     }
 
     public DeployableArtifactDetail() {
@@ -54,6 +59,10 @@ public String getSha256() {
         return sha256;
     }
 
+    public String getTargetRepository() {
+        return targetRepository;
+    }
+
     public Boolean isDeploySucceeded() {
         return deploySucceeded;
     }
diff --git a/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/task/DeployTask.java b/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/task/DeployTask.java
@@ -141,7 +141,7 @@ private void handleBuildInfoDeployment(ArtifactoryClientConfiguration accRoot, B
                 }
                 if (isGenerateDeployableArtifactsToFile(accRoot)) {
                     try {
-                        exportDeployableArtifacts(allDeployDetails, new File(accRoot.info.getDeployableArtifactsFilePath()), accRoot.info.isBackwardCompatibleDeployableArtifacts(), contextUrl);
+                        exportDeployableArtifacts(allDeployDetails, new File(accRoot.info.getDeployableArtifactsFilePath()), accRoot.info.isBackwardCompatibleDeployableArtifacts());
                     } catch (Exception e) {
                         log.error("Failed writing deployable artifacts to file: ", e);
                         throw new RuntimeException("Failed writing deployable artifacts to file", e);
@@ -235,9 +235,9 @@ private void exportBuildInfo(Build build, File toFile) throws IOException {
         BuildInfoExtractorUtils.saveBuildInfoToFile(build, toFile);
     }
 
-    private void exportDeployableArtifacts(Map<String, Set<DeployDetails>> allDeployDetails, File toFile, boolean exportBackwardCompatibleDeployableArtifacts, String rtUrl) throws IOException {
+    private void exportDeployableArtifacts(Map<String, Set<DeployDetails>> allDeployDetails, File toFile, boolean exportBackwardCompatibleDeployableArtifacts) throws IOException {
         log.debug("Exporting deployable artifacts to '{}'", toFile.getAbsolutePath());
-        DeployableArtifactsUtils.saveDeployableArtifactsToFile(allDeployDetails, toFile, exportBackwardCompatibleDeployableArtifacts, rtUrl);
+        DeployableArtifactsUtils.saveDeployableArtifactsToFile(allDeployDetails, toFile, exportBackwardCompatibleDeployableArtifacts);
     }
 
     private File getExportFile(ArtifactoryClientConfiguration clientConf) {
diff --git a/build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildDeploymentHelper.java b/build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildDeploymentHelper.java
@@ -82,8 +82,7 @@ public void deploy( Build                          build,
 
         if (!StringUtils.isEmpty(clientConf.info.getDeployableArtifactsFilePath())) {
             try {
-                String rtUrl = clientConf.info.getProps().get("artifactory.publish.contextUrl");
-                DeployableArtifactsUtils.saveDeployableArtifactsToFile(deployableArtifactsByModule, new File(clientConf.info.getDeployableArtifactsFilePath()), false, rtUrl);
+                DeployableArtifactsUtils.saveDeployableArtifactsToFile(deployableArtifactsByModule, new File(clientConf.info.getDeployableArtifactsFilePath()), false);
             } catch (Exception e) {
                 logger.error("Failed writing deployable artifacts to file: ", e);
                 throw new RuntimeException("Failed writing deployable artifacts to file", e);
diff --git a/build-info-extractor/src/main/java/org/jfrog/build/extractor/ModuleParallelDeployHelper.java b/build-info-extractor/src/main/java/org/jfrog/build/extractor/ModuleParallelDeployHelper.java
@@ -44,8 +44,12 @@ private void deploy(ArtifactoryManager artifactoryManager, Set<DeployDetails> de
         deployableArtifacts.forEach(artifact -> {
             try {
                 ArtifactoryUploadResponse response = artifactoryManager.upload(artifact, logPrefix);
+                // Save information returned from Artifactory after the deployment.
                 artifact.setDeploySucceeded(true);
                 artifact.setSha256(response.getChecksums().getSha256());
+                // When a maven SNAPSHOT artifact is deployed, Artifactory adds a timestamp to the artifact name, after the artifact is deployed.
+                // ArtifactPath needs to be updated accordingly.
+                artifact.setArtifactPath(response.getPath());
             } catch (IOException e) {
                 artifact.setDeploySucceeded(false);
                 artifact.setSha256("");
diff --git a/build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/deploy/DeployDetails.java b/build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/deploy/DeployDetails.java
@@ -107,6 +107,10 @@ public void setSha256(String sha256) {
         this.sha256=sha256;
     }
 
+    public void setArtifactPath(String artifactPath) {
+        this.artifactPath=artifactPath;
+    }
+
     public Boolean getDeploySucceeded() {
         return deploySucceeded;
     }
diff --git a/build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/deploy/DeployableArtifactsUtils.java b/build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/deploy/DeployableArtifactsUtils.java
@@ -3,8 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.exc.MismatchedInputException;
-import org.apache.commons.lang.StringUtils;
 import org.jfrog.build.client.DeployableArtifactDetail;
 
 import java.io.File;
@@ -20,18 +18,18 @@
  */
 public class DeployableArtifactsUtils {
 
-    public static void saveDeployableArtifactsToFile(Map<String, Set<DeployDetails>> deployableArtifactsByModule, File toFile, boolean saveBackwardCompatible, String rtUrl) throws IOException {
+    public static void saveDeployableArtifactsToFile(Map<String, Set<DeployDetails>> deployableArtifactsByModule, File toFile, boolean saveBackwardCompatible) throws IOException {
         if (saveBackwardCompatible) {
             saveBackwardCompatibleDeployableArtifacts(deployableArtifactsByModule, toFile);
             return;
         }
-        saveDeployableArtifactsByModule(deployableArtifactsByModule, toFile, rtUrl);
+        saveDeployableArtifactsByModule(deployableArtifactsByModule, toFile);
     }
 
-    private static void saveDeployableArtifactsByModule(Map<String, Set<DeployDetails>> deployableArtifactsByModule, File toFile, String rtUrl) throws IOException {
+    private static void saveDeployableArtifactsByModule(Map<String, Set<DeployDetails>> deployableArtifactsByModule, File toFile) throws IOException {
         Map<String, List<DeployableArtifactDetail>> deployableArtifactsDetails = new HashMap<>();
         deployableArtifactsByModule.forEach((module, deployableArtifacts) ->
-                deployableArtifactsDetails.put(module, DeployableArtifactsUtils.getDeployableArtifactsPaths(deployableArtifacts, rtUrl)));
+                deployableArtifactsDetails.put(module, DeployableArtifactsUtils.getDeployableArtifactsPaths(deployableArtifacts)));
         ObjectMapper mapper = new ObjectMapper();
         mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         mapper.writeValue(toFile, deployableArtifactsDetails);
@@ -44,7 +42,7 @@ private static void saveDeployableArtifactsByModule(Map<String, Set<DeployDetail
     private static void saveBackwardCompatibleDeployableArtifacts(Map<String, Set<DeployDetails>> deployableArtifactsByModule, File toFile) throws IOException {
         List<DeployableArtifactDetail> deployableArtifactsList = new ArrayList<DeployableArtifactDetail>();
         deployableArtifactsByModule.forEach((module, deployableArtifacts) ->
-            deployableArtifactsList.addAll(DeployableArtifactsUtils.getDeployableArtifactsPaths(deployableArtifacts, "")));
+            deployableArtifactsList.addAll(DeployableArtifactsUtils.getDeployableArtifactsPaths(deployableArtifacts)));
         ObjectMapper mapper = new ObjectMapper();
         mapper.writeValue(toFile, deployableArtifactsList);
     }
@@ -84,15 +82,10 @@ private static Map<String, List<DeployableArtifactDetail>> loadBackwardCompatibl
         return deployableArtifactMap;
     }
 
-    private static List<DeployableArtifactDetail> getDeployableArtifactsPaths(Set<DeployDetails> deployDetails, String rtUrl) {
-        List<DeployableArtifactDetail> deployableArtifacts = new ArrayList<>();
+    private static List<DeployableArtifactDetail> getDeployableArtifactsPaths(Set<DeployDetails> deployDetails) {
+        List<DeployableArtifactDetail> deployableArtifacts = new ArrayList<DeployableArtifactDetail>();
         for (DeployDetails artifact : deployDetails) {
-            String artifactDest = artifact.getArtifactPath();
-            // In case we want artifact absolute path in Artifactory - add rtUrl and repository to destination.
-            if (StringUtils.isBlank(rtUrl)){
-                artifactDest = rtUrl + artifact.getTargetRepository() + "/" + artifactDest;
-            }
-            deployableArtifacts.add(new DeployableArtifactDetail(artifact.getFile().getAbsolutePath(), artifactDest, artifact.getSha1(), artifact.getSha256(), artifact.getDeploySucceeded()));
+            deployableArtifacts.add(new DeployableArtifactDetail(artifact.getFile().getAbsolutePath(), artifact.getArtifactPath(), artifact.getSha1(), artifact.getSha256(), artifact.getDeploySucceeded(), artifact.getTargetRepository()));
         }
         return deployableArtifacts;
     }

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ private void handleBuildInfoDeployment(ArtifactoryClientConfiguration accRoot, B`
`141`	`141`	`}`
`142`	`142`	`if (isGenerateDeployableArtifactsToFile(accRoot)) {`
`143`	`143`	`try {`
`144`		`- exportDeployableArtifacts(allDeployDetails, new File(accRoot.info.getDeployableArtifactsFilePath()), accRoot.info.isBackwardCompatibleDeployableArtifacts(), contextUrl);`
	`144`	`+ exportDeployableArtifacts(allDeployDetails, new File(accRoot.info.getDeployableArtifactsFilePath()), accRoot.info.isBackwardCompatibleDeployableArtifacts());`
`145`	`145`	`} catch (Exception e) {`
`146`	`146`	`log.error("Failed writing deployable artifacts to file: ", e);`
`147`	`147`	`throw new RuntimeException("Failed writing deployable artifacts to file", e);`
`@@ -235,9 +235,9 @@ private void exportBuildInfo(Build build, File toFile) throws IOException {`
`235`	`235`	`BuildInfoExtractorUtils.saveBuildInfoToFile(build, toFile);`
`236`	`236`	`}`
`237`	`237`
`238`		`- private void exportDeployableArtifacts(Map<String, Set<DeployDetails>> allDeployDetails, File toFile, boolean exportBackwardCompatibleDeployableArtifacts, String rtUrl) throws IOException {`
	`238`	`+ private void exportDeployableArtifacts(Map<String, Set<DeployDetails>> allDeployDetails, File toFile, boolean exportBackwardCompatibleDeployableArtifacts) throws IOException {`
`239`	`239`	`log.debug("Exporting deployable artifacts to '{}'", toFile.getAbsolutePath());`
`240`		`- DeployableArtifactsUtils.saveDeployableArtifactsToFile(allDeployDetails, toFile, exportBackwardCompatibleDeployableArtifacts, rtUrl);`
	`240`	`+ DeployableArtifactsUtils.saveDeployableArtifactsToFile(allDeployDetails, toFile, exportBackwardCompatibleDeployableArtifacts);`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`private File getExportFile(ArtifactoryClientConfiguration clientConf) {`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,10 @@ public void setSha256(String sha256) {`
`107`	`107`	`this.sha256=sha256;`
`108`	`108`	`}`
`109`	`109`
	`110`	`+ public void setArtifactPath(String artifactPath) {`
	`111`	`+ this.artifactPath=artifactPath;`
	`112`	`+ }`
	`113`	`+`
`110`	`114`	`public Boolean getDeploySucceeded() {`
`111`	`115`	`return deploySucceeded;`
`112`	`116`	`}`