Merge pull request #29615 from hashicorp/f-aws_lambda_function-valida…

…tion-err `[r|d]/aws_lambda_function`: Migrate to AWS SDK v2
hashicorp · Feb 24, 2023 · b246857 · b246857
2 parents 17be70b + dd3f451
commit b246857
Show file tree

Hide file tree

Showing 14 changed files with 417 additions and 362 deletions.
diff --git a/go.mod b/go.mod
@@ -18,6 +18,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/inspector2 v1.11.5
 	github.com/aws/aws-sdk-go-v2/service/ivschat v1.3.4
 	github.com/aws/aws-sdk-go-v2/service/kendra v1.38.5
+	github.com/aws/aws-sdk-go-v2/service/lambda v1.29.4
 	github.com/aws/aws-sdk-go-v2/service/medialive v1.29.4
 	github.com/aws/aws-sdk-go-v2/service/oam v1.1.5
 	github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.1.5

diff --git a/go.sum b/go.sum
@@ -72,6 +72,8 @@ github.com/aws/aws-sdk-go-v2/service/ivschat v1.3.4 h1:nGVv8RFgC4P7BsnL/NPGhT8W0
 github.com/aws/aws-sdk-go-v2/service/ivschat v1.3.4/go.mod h1:Ic/51aMt0SrY+rLEBYCMW6iuORW0wQJ/rhV0PGg07mQ=
 github.com/aws/aws-sdk-go-v2/service/kendra v1.38.5 h1:vYyn1h1+/eRL8UxfzRgxhH8tm+Jd6ujsyXmUFztfnks=
 github.com/aws/aws-sdk-go-v2/service/kendra v1.38.5/go.mod h1:PMq9hXXhaNxmBMIolmknhJ9gXi4PYDsZwsFBaJs7Zak=
+github.com/aws/aws-sdk-go-v2/service/lambda v1.29.4 h1:gYGaEptCzFTlw91ETLla+d33SilaGnuJIT2ksJYXoVc=
+github.com/aws/aws-sdk-go-v2/service/lambda v1.29.4/go.mod h1:iPDYs5hrSZ+/8Ifoq9ZpoiuHZXDEJx9Udurdoq20958=
 github.com/aws/aws-sdk-go-v2/service/medialive v1.29.4 h1:1K+jiIQQdFGgYUmITnQRTRFQSCv0fUIH/X//Kgq0m/8=
 github.com/aws/aws-sdk-go-v2/service/medialive v1.29.4/go.mod h1:MDHSj74ylVyTusJYPIoFhNXqwaD8W8cIf8yTEI7+ccc=
 github.com/aws/aws-sdk-go-v2/service/oam v1.1.5 h1:b4IaVHpAfwj2cOmTUgoIFTjLjTuC1yh3Ml3K7cjZFaU=

diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go
diff --git a/internal/conns/config_gen.go b/internal/conns/config_gen.go
diff --git a/internal/service/lambda/flex.go b/internal/service/lambda/flex.go
@@ -1,6 +1,7 @@
 package lambda
 
 import (
+	"github.com/aws/aws-sdk-go-v2/service/lambda/types"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/lambda"
 	"github.com/hashicorp/terraform-provider-aws/internal/flex"
@@ -18,15 +19,15 @@ func flattenAliasRoutingConfiguration(arc *lambda.AliasRoutingConfiguration) []i
 	return []interface{}{m}
 }
 
-func flattenLayers(layers []*lambda.Layer) []interface{} {
+func flattenLayers(layers []types.Layer) []interface{} {
 	arns := make([]*string, len(layers))
 	for i, layer := range layers {
 		arns[i] = layer.Arn
 	}
 	return flex.FlattenStringList(arns)
 }
 
-func flattenVPCConfigResponse(s *lambda.VpcConfigResponse) []map[string]interface{} {
+func flattenVPCConfigResponse(s *types.VpcConfigResponse) []map[string]interface{} {
 	settings := make(map[string]interface{})
 
 	if s == nil {
@@ -41,8 +42,8 @@ func flattenVPCConfigResponse(s *lambda.VpcConfigResponse) []map[string]interfac
 		return nil
 	}
 
-	settings["subnet_ids"] = flex.FlattenStringSet(s.SubnetIds)
-	settings["security_group_ids"] = flex.FlattenStringSet(s.SecurityGroupIds)
+	settings["subnet_ids"] = flex.FlattenStringValueSet(s.SubnetIds)
+	settings["security_group_ids"] = flex.FlattenStringValueSet(s.SecurityGroupIds)
 	if s.VpcId != nil {
 		settings["vpc_id"] = aws.StringValue(s.VpcId)
 	}