Tech debt: Migrate glacier resources to AWS SDK for Go v2

go.mod

@@ -21,6 +21,7 @@ require (
  github.com/aws/aws-sdk-go-v2/service/ec2 v1.99.0
  github.com/aws/aws-sdk-go-v2/service/finspace v1.10.0
  github.com/aws/aws-sdk-go-v2/service/fis v1.14.10
+ github.com/aws/aws-sdk-go-v2/service/glacier v1.14.11
  github.com/aws/aws-sdk-go-v2/service/healthlake v1.16.0
  github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.11
  github.com/aws/aws-sdk-go-v2/service/inspector2 v1.14.0

go.sum

@@ -67,6 +67,8 @@ github.com/aws/aws-sdk-go-v2/service/finspace v1.10.0 h1:vZczEtJSs8HEkZ9JuxkKIHg
 github.com/aws/aws-sdk-go-v2/service/finspace v1.10.0/go.mod h1:y9XeW3Hxtkh+Sled61taaqOk1Lk7wdGpLRBx9Z/twOk=
 github.com/aws/aws-sdk-go-v2/service/fis v1.14.10 h1:uDfGkU0W6mO34XFbXgc9sFjOXTNA6IRoeeoPkCnZnx4=
 github.com/aws/aws-sdk-go-v2/service/fis v1.14.10/go.mod h1:UFu/qHPW17t5CcwChAc76mSq3v/bRyzhqjwiTcqlwLI=
+github.com/aws/aws-sdk-go-v2/service/glacier v1.14.11 h1:dTa4Macg5HxqrQfauBnhpx5cDU9S17mpMI/++BuG/2g=
+github.com/aws/aws-sdk-go-v2/service/glacier v1.14.11/go.mod h1:7RgtFQVsN4MpvQieAJkHSUuvPTiMcEZO57tAnpzlM1I=
 github.com/aws/aws-sdk-go-v2/service/healthlake v1.16.0 h1:8CXnXojAdCTtFhrJn2Ez6DDFFykbd9lWOu0Frs1zoqk=
 github.com/aws/aws-sdk-go-v2/service/healthlake v1.16.0/go.mod h1:n1IxBDIRdNPVLrEDqwDSZSF60FkFIO43gWVMZo4Y/Rk=
 github.com/aws/aws-sdk-go-v2/service/iam v1.19.12 h1:JH1H7POlsZt41X9JYIBLZoXW0Qv+WOuC48xsafsls2Q=

internal/generate/tags/templates/v2/service_tags_value_map_body.tmpl

@@ -28,3 +28,14 @@ func SetTagsOut(ctx context.Context, tags map[string]string) {
  inContext.TagsOut = types.Some(KeyValueTags(ctx, tags))
  }
 }
+
+{{- if ne .CreateTagsFunc "" }}
+// {{ .CreateTagsFunc }} creates {{ .ServicePackage }} service tags for new resources.
+func {{ .CreateTagsFunc }}(ctx context.Context, conn {{ .ClientType }}, identifier{{ if .TagResTypeElem }}, resourceType{{ end }} string, tags map[string]string) error {
+ if len(tags) == 0 {
+ return nil
+ }
+
+ return {{ .UpdateTagsFunc }}(ctx, conn, identifier{{ if .TagResTypeElem }}, resourceType{{ end }}, nil, tags)
+}
+{{- end }}

internal/service/glacier/exports_test.go

@@ -0,0 +1,10 @@
+package glacier
+
+// Exports for use in tests only.
+var (
+ ResourceVault = resourceVault
+ ResourceVaultLock = resourceVaultLock
+
+ FindVaultByName = findVaultByName
+ FindVaultLockByName = findVaultLockByName
+)

internal/service/glacier/generate.go

@@ -1,4 +1,4 @@
-//go:generate go run ../../generate/tags/main.go -ListTags -ListTagsOp=ListTagsForVault -ListTagsInIDElem=VaultName -ServiceTagsMap -TagOp=AddTagsToVault -TagInIDElem=VaultName -UntagOp=RemoveTagsFromVault -UpdateTags -CreateTags
+//go:generate go run ../../generate/tags/main.go -AWSSDKVersion=2 -ListTags -ListTagsOp=ListTagsForVault -ListTagsInIDElem=VaultName -ServiceTagsMap -KVTValues -TagOp=AddTagsToVault -TagInIDElem=VaultName -UntagOp=RemoveTagsFromVault -UpdateTags -CreateTags -SkipTypesImp
 // ONLY generate directives and package declaration! Do not add anything else to this file.
 
 package glacier

internal/service/glacier/sweep.go

@@ -7,8 +7,8 @@ import (
  "fmt"
  "log"
 
- "github.com/aws/aws-sdk-go/aws"
- "github.com/aws/aws-sdk-go/service/glacier"
+ "github.com/aws/aws-sdk-go-v2/aws"
+ "github.com/aws/aws-sdk-go-v2/service/glacier"
  "github.com/hashicorp/terraform-plugin-testing/helper/resource"
  "github.com/hashicorp/terraform-provider-aws/internal/conns"
  "github.com/hashicorp/terraform-provider-aws/internal/sweep"
@@ -28,32 +28,29 @@ func sweepVaults(region string) error {
  return fmt.Errorf("error getting client: %w", err)
  }
  input := &glacier.ListVaultsInput{}
- conn := client.(*conns.AWSClient).GlacierConn()
+ conn := client.(*conns.AWSClient).GlacierClient()
  sweepResources := make([]sweep.Sweepable, 0)
 
- err = conn.ListVaultsPagesWithContext(ctx, input, func(page *glacier.ListVaultsOutput, lastPage bool) bool {
- if page == nil {
- return !lastPage
+ pages := glacier.NewListVaultsPaginator(conn, input)
+ for pages.HasMorePages() {
+ page, err := pages.NextPage(ctx)
+
+ if sweep.SkipSweepError(err) {
+ log.Printf("[WARN] Skipping Glacier Vault sweep for %s: %s", region, err)
+ return nil
+ }
+
+ if err != nil {
+ return fmt.Errorf("error listing Glacier Vaults (%s): %w", region, err)
  }
 
  for _, v := range page.VaultList {
- r := ResourceVault()
+ r := resourceVault()
  d := r.Data(nil)
- d.SetId(aws.StringValue(v.VaultName))
+ d.SetId(aws.ToString(v.VaultName))
 
  sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client))
  }
-
- return !lastPage
- })
-
- if sweep.SkipSweepError(err) {
- log.Printf("[WARN] Skipping Glacier Vault sweep for %s: %s", region, err)
- return nil
- }
-
- if err != nil {
- return fmt.Errorf("error listing Glacier Vaults (%s): %w", region, err)
  }
 
  err = sweep.SweepOrchestratorWithContext(ctx, sweepResources)