STONEBLD-1198 Use prependTag in reuse determination. Use DigestUtils

Author: rnc

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/build/LookupBuildInfoCommand.java

@@ -344,14 +344,13 @@ private void doBuildAnalysis(String scmUrl, String scmTag, String context, Build
             if (registries != null) {
                 String[] splitRegistries = registries.split(";", -1);
 
-                String token = envToken.orElse("");
-
                 for (String value : splitRegistries) {
                     ImageRegistry registry = Util.parseRegistry(value);
                     // Meant to match Go code that does
                     // util.HashString(abr.Status.SCMInfo.SCMURL + abr.Status.SCMInfo.Tag + abr.Status.SCMInfo.Path)
                     String contextPath = context == null ? "" : context;
-                    String imageId = DigestUtils.md5Hex(scmUrl + tag + contextPath);
+                    String prependTag = isBlank(registry.getPrependTag()) ? "" : registry.getPrependTag() + "_";
+                    String imageId = prependTag + DigestUtils.md5Hex(scmUrl + tag + contextPath);
                     String port = isBlank(registry.getPort()) ? "443" : registry.getPort();
                     String fullName = registry.getHost() + (port.equals("443") ? "" : ":" + port) + "/" + registry.getOwner()
                             + "/" + registry.getRepository() + ":" + imageId;

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/deploy/DeployCommand.java

@@ -339,7 +339,7 @@ private Optional<Gav> getGav(String entryName, String prependTag) {
             List<String> groupIdList = pathParts.subList(0, numberOfParts - 3);
             String groupId = String.join(DOT, groupIdList);
 
-            return Optional.of(Gav.create(groupId, artifactId, version, prependTag));
+            return Optional.of(Gav.create(groupId, artifactId, version));
         }
         return Optional.empty();
     }

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/deploy/DeployData.java

@@ -10,14 +10,9 @@ public final class DeployData {
     private final Path artifactsPath;
     private final Set<Gav> gavs;
 
-    public DeployData(Path artifactsPath, Set<Gav> gavs) {
+    public DeployData(Path artifactsPath, Set<String> gavs) {
         this.artifactsPath = artifactsPath;
-        this.gavs = gavs;
-    }
-
-    public DeployData(Path artifactsPath, Set<String> gavs, String prependTag) {
-        this.artifactsPath = artifactsPath;
-        this.gavs = gavs.stream().map(s -> Gav.parse(s, prependTag)).collect(Collectors.toSet());
+        this.gavs = gavs.stream().map(Gav::parse).collect(Collectors.toSet());
     }
 
     public Path getArtifactsPath() {

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/deploy/DeployerUtil.java

@@ -2,7 +2,12 @@
 
 import java.util.Objects;
 
+import org.apache.commons.codec.digest.DigestUtils;
+
 public final class Gav {
+
+    private static final String GAV_FORMAT = "%s:%s:%s";
+
     private final String groupId;
     private final String artifactId;
     private final String version;
@@ -15,19 +20,13 @@ private Gav(String groupId, String artifactId, String version, String tag) {
         this.tag = tag;
     }
 
-    public static Gav parse(String gav, String prependTag) {
+    public static Gav parse(String gav) {
         var parts = gav.split(":");
-        return create(parts[0], parts[1], parts[2], prependTag);
+        return create(parts[0], parts[1], parts[2]);
     }
 
-    public static Gav create(String groupId, String artifactId, String version, String prependTag) {
-        String tag = DeployerUtil.sha256sum(groupId, artifactId, version);
-        if (!prependTag.isBlank()) {
-            tag = prependTag + "_" + tag;
-        }
-        if (tag.length() > 128) {
-            tag = tag.substring(0, 128);
-        }
+    public static Gav create(String groupId, String artifactId, String version) {
+        String tag = DigestUtils.sha256Hex(String.format(GAV_FORMAT, groupId, artifactId, version));
         return new Gav(groupId, artifactId, version, tag);
     }
 

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/deploy/Gav.java

@@ -91,7 +91,7 @@ public void deployArchive(Path deployDir, Path sourcePath, Path logsPath, Set<St
         Log.debugf("Using Container registry %s:%d/%s/%s", host, port, owner, repository);
 
         // Read the tar to get the gavs and files
-        DeployData imageData = new DeployData(deployDir, gavs, prependTag);
+        DeployData imageData = new DeployData(deployDir, gavs);
 
         try {
             // Create the image layers
@@ -109,7 +109,7 @@ public void tagArchive(List<String> gavNames) throws Exception {
 
         Deque<Gav> gavs = new ArrayDeque<>();
         for (var i : gavNames) {
-            gavs.push(Gav.parse(i, prependTag));
+            gavs.push(Gav.parse(i));
         }
         Gav first = gavs.pop();
         String existingImage = createImageName(imageId);
@@ -260,6 +260,16 @@ private String createImageName() {
     }
 
     private String createImageName(String tag) {
+        // As the tests utilise prependTag for uniqueness so check for that
+        // here to avoid reusing images when we want differentiation.
+        if (!prependTag.isBlank()) {
+            tag = prependTag + "_" + tag;
+        }
+        // Docker tag maximum size is 128
+        // https://docs.docker.com/engine/reference/commandline/tag/
+        if (tag.length() > 128) {
+            tag = tag.substring(0, 128);
+        }
         if (port == 443) {
             return host + "/" + owner + "/" + repository
                     + ":" + tag;

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/deploy/containerregistry/ContainerRegistryDeployer.java

@@ -64,6 +64,7 @@ func createPipelineSpec(tool string, commitTime int64, jbsConfig *v1alpha12.JBSC
 	gitArgs := gitArgs(db, recipe)
 	install := additionalPackages(recipe)
 
+	println("PREBUILD IMAGE: " + preBuildImageName)
 	println("HERMETIC IMAGE: " + hermeticPreBuildImageName)
 
 	preprocessorArgs := []string{
@@ -627,6 +628,8 @@ func imageRegistryCommands(imageId string, recipe *v1alpha12.BuildRecipe, db *v1
 	}
 	if jbsConfig.ImageRegistry().PrependTag != "" {
 		registryArgs = append(registryArgs, "--registry-prepend-tag="+imageRegistry.PrependTag)
+		preBuildImageName = prependTagToImage(preBuildImageName, jbsConfig.Spec.ImageRegistry.PrependTag)
+		hermeticPreBuildImageName = prependTagToImage(hermeticPreBuildImageName, jbsConfig.Spec.ImageRegistry.PrependTag)
 	}
 	deployArgs = append(deployArgs, registryArgs...)
 	hermeticDeployArgs = append(hermeticDeployArgs, registryArgs...)
@@ -643,9 +646,22 @@ func imageRegistryCommands(imageId string, recipe *v1alpha12.BuildRecipe, db *v1
 		"--repository-path=$(workspaces.source.path)/build-info/",
 	}
 	hermeticPreBuildImageArgs = append(hermeticPreBuildImageArgs, registryArgs...)
+
 	return preBuildImageName, hermeticPreBuildImageName, preBuildImageArgs, deployArgs, hermeticDeployArgs, tagArgs, hermeticPreBuildImageArgs
 }
 
+// This is equivalent to ContainerRegistryDeployer.java::createImageName with the same image tag length restriction.
+func prependTagToImage(imageId string, prependTag string) string {
+	i := strings.LastIndex(imageId, ":")
+	slice := imageId[0:i]
+	tag := prependTag + "_" + imageId[i+1:]
+	if len(tag) > 128 {
+		tag = tag[0:128]
+	}
+	imageId = slice + ":" + tag
+	return imageId
+}
+
 func verifyParameters(jbsConfig *v1alpha12.JBSConfig, recipe *v1alpha12.BuildRecipe) []string {
 	verifyBuiltArtifactsArgs := []string{
 		"verify-built-artifacts",

pkg/reconciler/dependencybuild/buildrecipeyaml.go

@@ -0,0 +1,23 @@
+package dependencybuild
+
+import (
+	. "github.com/onsi/gomega"
+	"testing"
+)
+
+func TestImageRegistryArrayToString(t *testing.T) {
+	g := NewGomegaWithT(t)
+	prependTag := "123456"
+	imageId := "quay.io:993/foo/artifact-deployments:975ea3800099190263d38f051c1a188a-pre-build-image"
+	imageId = prependTagToImage(imageId, prependTag)
+	g.Expect(imageId).To(Equal("quay.io:993/foo/artifact-deployments:123456_975ea3800099190263d38f051c1a188a-pre-build-image"))
+	imageId = "quay.io/foo/artifact-deployments:975ea3800099190263d38f051c1a188a-pre-build-image"
+	imageId = prependTagToImage(imageId, prependTag)
+	g.Expect(imageId).To(Equal("quay.io/foo/artifact-deployments:123456_975ea3800099190263d38f051c1a188a-pre-build-image"))
+	imageId = "quay.io/foobar-repository/jvm-build-mxlq-tenant/jvm-build-service-artifacts/artifact-deployments:975ea3800099190263d38f051c1a188a-pre-build-image"
+	imageId = prependTagToImage(imageId, prependTag)
+	g.Expect(imageId).To(Equal("quay.io/foobar-repository/jvm-build-mxlq-tenant/jvm-build-service-artifacts/artifact-deployments:123456_975ea3800099190263d38f051c1a188a-pre-build-image"))
+	imageId = "quay.io/foo/artifact-deployments:975ea3800099190263d38f051c1a188a975ea3800099190263d38f051c1a188a975ea3800099190263d38f051c1a188a975ea3800099190263d38f051c1a188a"
+	imageId = prependTagToImage(imageId, prependTag)
+	g.Expect(imageId).To(Equal("quay.io/foo/artifact-deployments:123456_975ea3800099190263d38f051c1a188a975ea3800099190263d38f051c1a188a975ea3800099190263d38f051c1a188a975ea3800099190263d38f051"))
+}