Merge pull request #38342 from mattburgess/emrcontainers-awssdkv2-mig…

…ration emrcontainers: Migrate to AWS SDK v2
hashicorp · Jul 19, 2024 · 396ae6c · 396ae6c
2 parents fb7f045 + 14021f4
commit 396ae6c
Show file tree

Hide file tree

Showing 16 changed files with 480 additions and 402 deletions.
diff --git a/go.mod b/go.mod
@@ -104,6 +104,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.33.3
 	github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.25.3
 	github.com/aws/aws-sdk-go-v2/service/emr v1.42.2
+	github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.30.4
 	github.com/aws/aws-sdk-go-v2/service/emrserverless v1.23.3
 	github.com/aws/aws-sdk-go-v2/service/eventbridge v1.33.3
 	github.com/aws/aws-sdk-go-v2/service/evidently v1.21.3

diff --git a/go.sum b/go.sum
@@ -228,6 +228,8 @@ github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.25.3 h1:zBRYKbRPym+K+e
 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.25.3/go.mod h1:gcxottKSKiMNTNYkuor9kcKxyt0Z5ZG1SsdvNH6L5o8=
 github.com/aws/aws-sdk-go-v2/service/emr v1.42.2 h1:j3aHjEsxFGCNGOCJjJM6AtPhdvn1pw2i2hGqxLU0qeI=
 github.com/aws/aws-sdk-go-v2/service/emr v1.42.2/go.mod h1:rN91rXF7gucnSnArDWbv9xDdZjBEetO4LFoJgGK/Wqw=
+github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.30.4 h1:3GUbTjfuJM3GFWkgth1pIa63v/4UKcLznHqubWcbLWc=
+github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.30.4/go.mod h1:JzEDBk3bq/xt5PM+OG+B6abbT/fBsoK3ia4EyLh3JMA=
 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.23.3 h1:zxpxkpY1h+kPWquiUSG8u2CJ3AtEJPqqBqiMKxLwPjI=
 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.23.3/go.mod h1:9+NjcAre2lLrpGvCrb9V+TUDii5D+Z8xER/vCPZdZFg=
 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.33.3 h1:pjZzcXU25gsD2WmlmlayEsyXIWMVOK3//x4BXvK9c0U=

diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go
diff --git a/internal/service/emrcontainers/exports_test.go b/internal/service/emrcontainers/exports_test.go
@@ -0,0 +1,13 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package emrcontainers
+
+// Exports for use in tests only.
+var (
+	ResourceJobTemplate    = resourceJobTemplate
+	ResourceVirtualCluster = resourceVirtualCluster
+
+	FindJobTemplateByID    = findJobTemplateByID
+	FindVirtualClusterByID = findVirtualClusterByID
+)
diff --git a/internal/service/emrcontainers/generate.go b/internal/service/emrcontainers/generate.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-//go:generate go run ../../generate/tags/main.go -ListTags -ServiceTagsMap -UpdateTags
+//go:generate go run ../../generate/tags/main.go -AWSSDKVersion=2 -KVTValues -ListTags -ServiceTagsMap -SkipTypesImp -UpdateTags
 //go:generate go run ../../generate/servicepackage/main.go
 // ONLY generate directives and package declaration! Do not add anything else to this file.