Merge pull request #14584 from terraform-providers/b-ecr-resource-crash

resource/ecr_repository: safely handle nil encryption information returned from API
hashicorp · Aug 12, 2020 · 2de31ed · 2de31ed
2 parents d5dfe9b + 0818fd5
commit 2de31ed
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/aws/resource_aws_ecr_repository.go b/aws/resource_aws_ecr_repository.go
@@ -230,6 +230,10 @@ func expandEcrRepositoryEncryptionConfiguration(data []interface{}) *ecr.Encrypt
 }
 
 func flattenEcrRepositoryEncryptionConfiguration(ec *ecr.EncryptionConfiguration) []map[string]interface{} {
+	if ec == nil {
+		return nil
+	}
+
 	config := map[string]interface{}{
 		"encryption_type": aws.StringValue(ec.EncryptionType),
 		"kms_key":         aws.StringValue(ec.KmsKey),