Merge pull request #1550 from snyk/fix/ecr_repository_policy

fix: ecr repo without policy was crashing the whole execution
snyk · Jun 23, 2022 · cde2d4c · cde2d4c
2 parents e9746d8 + 39aa6d5
commit cde2d4c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/pkg/remote/aws/ecr_repository_policy_enumerator.go b/pkg/remote/aws/ecr_repository_policy_enumerator.go
@@ -1,6 +1,7 @@
 package aws
 
 import (
+	"github.com/aws/aws-sdk-go/service/ecr"
 	"github.com/snyk/driftctl/pkg/remote/aws/repository"
 	remoteerror "github.com/snyk/driftctl/pkg/remote/error"
 	"github.com/snyk/driftctl/pkg/resource"
@@ -33,6 +34,9 @@ func (e *ECRRepositoryPolicyEnumerator) Enumerate() ([]*resource.Resource, error
 
 	for _, repo := range repos {
 		repoOutput, err := e.repository.GetRepositoryPolicy(repo)
+		if _, ok := err.(*ecr.RepositoryPolicyNotFoundException); ok {
+			continue
+		}
 		if err != nil {
 			return nil, remoteerror.NewResourceListingError(err, string(e.SupportedType()))
 		}

diff --git a/pkg/remote/aws_ecr_scanner_test.go b/pkg/remote/aws_ecr_scanner_test.go
@@ -138,13 +138,17 @@ func TestECRRepositoryPolicy(t *testing.T) {
 			mocks: func(client *repository.MockECRRepository, alerter *mocks.AlerterInterface) {
 				client.On("ListAllRepositories").Return([]*ecr.Repository{
 					{RepositoryName: awssdk.String("test_ecr_repo_policy")},
+					{RepositoryName: awssdk.String("test_ecr_repo_without_policy")},
 				}, nil)
 				client.On("GetRepositoryPolicy", &ecr.Repository{
 					RepositoryName: awssdk.String("test_ecr_repo_policy"),
 				}).Return(&ecr.GetRepositoryPolicyOutput{
 					RegistryId:     awssdk.String("1"),
 					RepositoryName: awssdk.String("test_ecr_repo_policy"),
 				}, nil)
+				client.On("GetRepositoryPolicy", &ecr.Repository{
+					RepositoryName: awssdk.String("test_ecr_repo_without_policy"),
+				}).Return(nil, &ecr.RepositoryPolicyNotFoundException{})
 			},
 			assertExpected: func(t *testing.T, got []*resource.Resource) {
 				assert.Len(t, got, 1)