Updated the logic of updating ImageName with ImageDigest (#10676) (#10748)

vinodkumar3 · web-flow · commit 4b00a51e1f9e · 2019-06-25T16:15:04.000+05:30
* Bug fix in logic of updating image digest

* removing comments

* Added missing mapping

* Update Update-DockerImageSettings.psm1

* Addressed review comments

* Addressed review comments
diff --git a/Tasks/ServiceFabricUpdateManifestsV2/Update-DockerImageSettings.psm1 b/Tasks/ServiceFabricUpdateManifestsV2/Update-DockerImageSettings.psm1
@@ -43,6 +43,7 @@ function Update-DockerImageSettings
             {
                 throw (Get-VstsLocString -Key InvalidImageDigestValue -ArgumentList @($imageDigestValue, $imageDigestsPath))
             }
+            $imageDigestRepoNameWithRegistry = $imageDigestValue.Substring(0, $hashSeparatorIndex)
             $imageDigestRepoName = $imageDigestValue.Substring($slashIndex + 1, $hashSeparatorIndex - $slashIndex - 1)
 
             if ($imageNames -ne $null)
@@ -67,6 +68,10 @@ function Update-DockerImageSettings
                 {
                     throw (Get-VstsLocString -Key AmbiguousImages -ArgumentList @($imageName))
                 }
+
+                if($imageDigestRepoNameWithRegistry -ne $imageDigestRepoName ){
+                    $imageNameToDigestMapping[$imageDigestRepoNameWithRegistry] = $imageDigestValue
+                }
             }
             $imageNameToDigestMapping[$imageName] = $imageDigestValue
         }
@@ -117,4 +122,4 @@ function Update-DockerImageSettings
     } finally {
         Trace-VstsLeavingInvocation $MyInvocation
     }
-}
+}
diff --git a/Tasks/ServiceFabricUpdateManifestsV2/task.json b/Tasks/ServiceFabricUpdateManifestsV2/task.json
@@ -20,7 +20,7 @@
     "version": {
         "Major": 2,
         "Minor": 4,
-        "Patch": 4
+        "Patch": 5
     },
     "minimumAgentVersion": "1.95.0",
     "instanceNameFormat": "Update Service Fabric Manifests ($(updateType))",
diff --git a/Tasks/ServiceFabricUpdateManifestsV2/task.loc.json b/Tasks/ServiceFabricUpdateManifestsV2/task.loc.json
@@ -20,7 +20,7 @@
   "version": {
     "Major": 2,
     "Minor": 4,
-    "Patch": 4
+    "Patch": 5
   },
   "minimumAgentVersion": "1.95.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ function Update-DockerImageSettings`
`43`	`43`	`{`
`44`	`44`	`throw (Get-VstsLocString -Key InvalidImageDigestValue -ArgumentList @($imageDigestValue, $imageDigestsPath))`
`45`	`45`	`}`
	`46`	`+ $imageDigestRepoNameWithRegistry = $imageDigestValue.Substring(0, $hashSeparatorIndex)`
`46`	`47`	`$imageDigestRepoName = $imageDigestValue.Substring($slashIndex + 1, $hashSeparatorIndex - $slashIndex - 1)`
`47`	`48`
`48`	`49`	`if ($imageNames -ne $null)`
`@@ -67,6 +68,10 @@ function Update-DockerImageSettings`
`67`	`68`	`{`
`68`	`69`	`throw (Get-VstsLocString -Key AmbiguousImages -ArgumentList @($imageName))`
`69`	`70`	`}`
	`71`	`+`
	`72`	`+ if($imageDigestRepoNameWithRegistry -ne $imageDigestRepoName ){`
	`73`	`+ $imageNameToDigestMapping[$imageDigestRepoNameWithRegistry] = $imageDigestValue`
	`74`	`+ }`
`70`	`75`	`}`
`71`	`76`	`$imageNameToDigestMapping[$imageName] = $imageDigestValue`
`72`	`77`	`}`
`@@ -117,4 +122,4 @@ function Update-DockerImageSettings`
`117`	`122`	`} finally {`
`118`	`123`	`Trace-VstsLeavingInvocation $MyInvocation`
`119`	`124`	`}`
`120`		`-}`
	`125`	`+}`