imageDigest only for ecr

Author: cyastella

agent/engine/docker_image_manager.go

@@ -138,20 +138,27 @@ func (imageManager *dockerImageManager) RecordContainerReference(container *apic
 	return nil
 }
 
+// check whether image pull from ECR
+func (imageManager *dockerImageManager) isImagePullFromECR(container *apicontainer.Container) bool {
+	return container.RegistryAuthentication != nil && container.RegistryAuthentication.ECRAuthData != nil && container.RegistryAuthentication.Type == apicontainer.AuthTypeECR
+}
+
 // The helper function to fetch the RepoImageDigest when inspect the image
 func (imageManager *dockerImageManager) fetchRepoDigest(imageInspected *types.ImageInspect, container *apicontainer.Container) string {
-	imageRepoDigests := imageInspected.RepoDigests
 	resultRepoDigest := ""
-	imagePrefix := strings.Split(container.Image, ":")[0]
-	for _, imageRepoDigest := range imageRepoDigests {
-		if strings.HasPrefix(imageRepoDigest, imagePrefix) {
-			repoDigestSplitList := strings.Split(imageRepoDigest, "@")
-			if len(repoDigestSplitList) > 1 {
-				resultRepoDigest = repoDigestSplitList[1]
-				return resultRepoDigest
-			} else {
-				seelog.Warnf("ImageRepoDigest doesn't have the right format: %v", imageRepoDigest)
-				return ""
+	if imageManager.isImagePullFromECR(container) {
+		imageRepoDigests := imageInspected.RepoDigests
+		imagePrefix := strings.Split(container.Image, "/")[0]
+		for _, imageRepoDigest := range imageRepoDigests {
+			if strings.HasPrefix(imageRepoDigest, imagePrefix) {
+				repoDigestSplitList := strings.Split(imageRepoDigest, "@")
+				if len(repoDigestSplitList) > 1 {
+					resultRepoDigest = repoDigestSplitList[1]
+					return resultRepoDigest
+				} else {
+					seelog.Warnf("ImageRepoDigest doesn't have the right format: %v", imageRepoDigest)
+					return ""
+				}
 			}
 		}
 	}

agent/engine/docker_image_manager_test.go

@@ -286,7 +286,7 @@ func TestFetchRepoDigest(t *testing.T) {
 			container: &apicontainer.Container{
 				Name:        "testContainer1",
 				Image:       "repo1",
-				ImageDigest: "digest1",
+				ImageDigest: "",
 			},
 			imageInspected: &types.ImageInspect{
 				RepoDigests: []string{"repo1@digest1", "repo2@digest2", "repo3@digest3"},
@@ -296,7 +296,7 @@ func TestFetchRepoDigest(t *testing.T) {
 			container: &apicontainer.Container{
 				Name:        "testContainer2",
 				Image:       "repo1:latest",
-				ImageDigest: "digest1",
+				ImageDigest: "",
 			},
 			imageInspected: &types.ImageInspect{
 				RepoDigests: []string{"repo1@digest1", "repo2@digest2", "repo3@digest3"},
@@ -306,7 +306,7 @@ func TestFetchRepoDigest(t *testing.T) {
 			container: &apicontainer.Container{
 				Name:        "testContainer3",
 				Image:       "repo1@sha256:12345",
-				ImageDigest: "sha256:12345",
+				ImageDigest: "",
 			},
 			imageInspected: &types.ImageInspect{
 				RepoDigests: []string{"repo1@sha256:12345", "repo2@digest2", "repo3"},
@@ -332,6 +332,38 @@ func TestFetchRepoDigest(t *testing.T) {
 				RepoDigests: []string{"mysql", "repo2@digest2"},
 			},
 		},
+		{
+			container: &apicontainer.Container{
+				Name:        "testContainer6",
+				Image:       "123456781234.dkr.ecr.us-west-2.amazonaws.com/test-rci@sha256:d1c14fcf2e9476ed58ebc4251b211f403f271e96b6c3d9ada0f1c5454ca4d230",
+				ImageDigest: "sha256:d1c14fcf2e9476ed58ebc4251b211f403f271e96b6c3d9ada0f1c5454ca4d230",
+				RegistryAuthentication: &apicontainer.RegistryAuthenticationData{
+					Type: "ecr",
+					ECRAuthData: &apicontainer.ECRAuthData{
+						RegistryID: "123456781234",
+					},
+				},
+			},
+			imageInspected: &types.ImageInspect{
+				RepoDigests: []string{"repo1@digest1", "repo2@digest2", "123456781234.dkr.ecr.us-west-2.amazonaws.com/test-rci@sha256:d1c14fcf2e9476ed58ebc4251b211f403f271e96b6c3d9ada0f1c5454ca4d230"},
+			},
+		},
+		{
+			container: &apicontainer.Container{
+				Name:        "testContainer7",
+				Image:       "123456781234.dkr.ecr.us-west-2.amazonaws.com/ubuntu:trusty",
+				ImageDigest: "sha256:2feffff9eeca4e736f9f8e57813a97fe930554f474f7795ffa5a9261adeaaf44",
+				RegistryAuthentication: &apicontainer.RegistryAuthenticationData{
+					Type: "ecr",
+					ECRAuthData: &apicontainer.ECRAuthData{
+						RegistryID: "123456781234",
+					},
+				},
+			},
+			imageInspected: &types.ImageInspect{
+				RepoDigests: []string{"repo1@digest1", "repo2@digest2", "", "123456781234.dkr.ecr.us-west-2.amazonaws.com/ubuntu@sha256:2feffff9eeca4e736f9f8e57813a97fe930554f474f7795ffa5a9261adeaaf44"},
+			},
+		},
 	}
 
 	for i, test := range testCases {