feat(dockerBranch): add branch info for docker images (#887)

spinnaker · Oct 8, 2020 · e87a629 · e87a629
1 parent 7b34d8f
commit e87a629
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/docker/DockerMonitor.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/docker/DockerMonitor.groovy
@@ -204,6 +204,8 @@ class DockerMonitor extends CommonPollingMonitor<ImageDelta, DockerPollingDelta>
             .ifPresent({ commitId -> metadata.put("commitId", commitId.toString()) })
           Optional.ofNullable(image.date)
             .ifPresent({ date -> metadata.put("date", date.toString()) })
+          Optional.ofNullable(image.branch)
+            .ifPresent({ branch -> metadata.put("branch", branch.toString()) })
 
 
           Artifact artifact = Artifact.builder()

diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/docker/service/TaggedImageList.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/docker/service/TaggedImageList.groovy
@@ -28,4 +28,5 @@ class TaggedImage {
     String buildNumber
     String commitId
     String date
+    String branch
 }
diff --git a/igor-web/src/test/groovy/com/netflix/spinnaker/igor/docker/DockerMonitorSpec.groovy b/igor-web/src/test/groovy/com/netflix/spinnaker/igor/docker/DockerMonitorSpec.groovy
@@ -104,7 +104,9 @@ class DockerMonitorSpec extends Specification {
       repository: "repository",
       digest: "digest",
       buildNumber: "111",
-      commitId: "ab12c3"
+      commitId: "ab12c3",
+      date: "1598707355157",
+      branch: "master"
     )
 
     when:
@@ -127,6 +129,8 @@ class DockerMonitorSpec extends Specification {
       assert artifacts[0].metadata.tag == "tag"
       assert artifacts[0].metadata.buildNumber == "111"
       assert artifacts[0].metadata.commitId == "ab12c3"
+      assert artifacts[0].metadata.date == "1598707355157"
+      assert artifacts[0].metadata.branch == "master"
       return true
     })
   }