Merge pull request #17082 from dspatoulas/PS-820/fix_deployments_bug

hashicorp · Feb 11, 2021 · ba56348 · ba56348
2 parents 497b0c0 + 48f807f
commit ba56348
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/.changelog/17082.txt b/.changelog/17082.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_lambda_function: Prevent crash when using `Image` package type
+```
diff --git a/aws/resource_aws_lambda_function.go b/aws/resource_aws_lambda_function.go
@@ -1315,7 +1315,7 @@ func expandLambdaFileSystemConfigs(fscMaps []interface{}) []*lambda.FileSystemCo
 func flattenLambdaImageConfig(response *lambda.ImageConfigResponse) []map[string]interface{} {
 	settings := make(map[string]interface{})
 
-	if response == nil || response.Error != nil {
+	if response == nil || response.Error != nil || response.ImageConfig == nil {
 		return nil
 	}
 

diff --git a/aws/resource_aws_lambda_function_test.go b/aws/resource_aws_lambda_function_test.go
@@ -3140,3 +3140,9 @@ resource "aws_lambda_function" "test" {
 }
 `, rName, runtime))
 }
+
+func TestFlattenLambdaImageConfigShouldNotFailWithEmptyImageConfig(t *testing.T) {
+	t.Parallel()
+	response := lambda.ImageConfigResponse{}
+	flattenLambdaImageConfig(&response)
+}