From 9c276d1d63dfa746cd7adf2f182f46796ae4508f Mon Sep 17 00:00:00 2001 From: Matt Burgess <549318+mattburgess@users.noreply.github.com> Date: Mon, 25 Mar 2024 23:07:30 +0000 Subject: [PATCH 001/208] appsync: Migrate to AWS SDK v2 --- go.mod | 1 + go.sum | 2 + internal/conns/awsclient_gen.go | 6 +- internal/service/appsync/api_cache.go | 53 ++--- internal/service/appsync/api_cache_test.go | 16 +- internal/service/appsync/api_key.go | 40 ++-- internal/service/appsync/api_key_test.go | 32 +-- internal/service/appsync/datasource.go | 190 ++++++++-------- internal/service/appsync/datasource_test.go | 41 ++-- internal/service/appsync/domain_name.go | 27 +-- .../appsync/domain_name_api_association.go | 25 ++- .../domain_name_api_association_test.go | 24 +- internal/service/appsync/domain_name_test.go | 28 +-- internal/service/appsync/find.go | 33 +-- internal/service/appsync/function.go | 86 +++---- internal/service/appsync/function_test.go | 43 ++-- internal/service/appsync/generate.go | 2 +- internal/service/appsync/graphql_api.go | 212 +++++++++--------- internal/service/appsync/graphql_api_test.go | 148 ++++++------ internal/service/appsync/resolver.go | 104 ++++----- internal/service/appsync/resolver_test.go | 65 +++--- .../appsync/service_endpoints_gen_test.go | 40 ++-- internal/service/appsync/service_package.go | 26 --- .../service/appsync/service_package_gen.go | 17 +- internal/service/appsync/status.go | 11 +- internal/service/appsync/sweep.go | 28 +-- internal/service/appsync/tags_gen.go | 33 ++- internal/service/appsync/type.go | 37 +-- internal/service/appsync/type_test.go | 16 +- internal/service/appsync/wait.go | 24 +- names/data/names_data.csv | 2 +- names/names.go | 1 + 32 files changed, 703 insertions(+), 710 deletions(-) delete mode 100644 internal/service/appsync/service_package.go diff --git a/go.mod b/go.mod index f7bc9468f01..6b1c45f4fa8 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appfabric v1.7.3 github.com/aws/aws-sdk-go-v2/service/appflow v1.41.3 github.com/aws/aws-sdk-go-v2/service/apprunner v1.28.3 + github.com/aws/aws-sdk-go-v2/service/appsync v1.31.3 github.com/aws/aws-sdk-go-v2/service/athena v1.40.3 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.32.3 github.com/aws/aws-sdk-go-v2/service/batch v1.35.1 diff --git a/go.sum b/go.sum index 647f06eb395..d85201a9ffb 100644 --- a/go.sum +++ b/go.sum @@ -60,6 +60,8 @@ github.com/aws/aws-sdk-go-v2/service/appflow v1.41.3 h1:tK9duUSGFRz/8nshXYyddbw2 github.com/aws/aws-sdk-go-v2/service/appflow v1.41.3/go.mod h1:D08dEVi5M9I0qAIl1IyMydjFQPcjQqCp2Mw3WqhCDbQ= github.com/aws/aws-sdk-go-v2/service/apprunner v1.28.3 h1:nby4wV20qfVF2yswXCFKL7lTkddNvYUj2P9+k/UbYQc= github.com/aws/aws-sdk-go-v2/service/apprunner v1.28.3/go.mod h1:ECUaiPa9O5LwqgVNeBduNwayctvWkc5nb8NdBLmLJ00= +github.com/aws/aws-sdk-go-v2/service/appsync v1.31.3 h1:P6IEs0+zLDoYP2vzLoPccaQRn1MnjkXwE6t0NlPeUQc= +github.com/aws/aws-sdk-go-v2/service/appsync v1.31.3/go.mod h1:vBD0NGVgRoouqxDtybMYcBPeFE9yCbfleWZyw95qkWk= github.com/aws/aws-sdk-go-v2/service/athena v1.40.3 h1:Q54tyTwpoEyJNmP4WqwT9hdPHpbpNahvcW9so6lItQw= github.com/aws/aws-sdk-go-v2/service/athena v1.40.3/go.mod h1:HP/WmaAcHBNMHa6EwxTMPdqCIbV0uCnWR8WNTp2AG5c= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.32.3 h1:Y9Tqv+Pb93GGLpxYoKYdz9ZdwpnT5HP6AFazR3moNlM= diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go index 49b10f47f61..35e02a6ac0e 100644 --- a/internal/conns/awsclient_gen.go +++ b/internal/conns/awsclient_gen.go @@ -12,6 +12,7 @@ import ( appfabric_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appfabric" appflow_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appflow" apprunner_sdkv2 "github.com/aws/aws-sdk-go-v2/service/apprunner" + appsync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appsync" athena_sdkv2 "github.com/aws/aws-sdk-go-v2/service/athena" auditmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/auditmanager" batch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/batch" @@ -155,7 +156,6 @@ import ( applicationinsights_sdkv1 "github.com/aws/aws-sdk-go/service/applicationinsights" appmesh_sdkv1 "github.com/aws/aws-sdk-go/service/appmesh" appstream_sdkv1 "github.com/aws/aws-sdk-go/service/appstream" - appsync_sdkv1 "github.com/aws/aws-sdk-go/service/appsync" autoscaling_sdkv1 "github.com/aws/aws-sdk-go/service/autoscaling" autoscalingplans_sdkv1 "github.com/aws/aws-sdk-go/service/autoscalingplans" backup_sdkv1 "github.com/aws/aws-sdk-go/service/backup" @@ -321,8 +321,8 @@ func (c *AWSClient) AppStreamConn(ctx context.Context) *appstream_sdkv1.AppStrea return errs.Must(conn[*appstream_sdkv1.AppStream](ctx, c, names.AppStream, make(map[string]any))) } -func (c *AWSClient) AppSyncConn(ctx context.Context) *appsync_sdkv1.AppSync { - return errs.Must(conn[*appsync_sdkv1.AppSync](ctx, c, names.AppSync, make(map[string]any))) +func (c *AWSClient) AppSyncClient(ctx context.Context) *appsync_sdkv2.Client { + return errs.Must(client[*appsync_sdkv2.Client](ctx, c, names.AppSync, make(map[string]any))) } func (c *AWSClient) ApplicationInsightsConn(ctx context.Context) *applicationinsights_sdkv1.ApplicationInsights { diff --git a/internal/service/appsync/api_cache.go b/internal/service/appsync/api_cache.go index f7b4c5d6db4..967f96f2a37 100644 --- a/internal/service/appsync/api_cache.go +++ b/internal/service/appsync/api_cache.go @@ -7,13 +7,14 @@ import ( "context" "log" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) @@ -35,14 +36,14 @@ func ResourceAPICache() *schema.Resource { Required: true, }, "api_caching_behavior": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.ApiCachingBehavior_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.ApiCachingBehavior](), }, "type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.ApiCacheType_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.ApiCacheType](), }, "ttl": { Type: schema.TypeInt, @@ -64,26 +65,26 @@ func ResourceAPICache() *schema.Resource { func resourceAPICacheCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID := d.Get("api_id").(string) params := &appsync.CreateApiCacheInput{ ApiId: aws.String(apiID), - Type: aws.String(d.Get("type").(string)), - ApiCachingBehavior: aws.String(d.Get("api_caching_behavior").(string)), - Ttl: aws.Int64(int64(d.Get("ttl").(int))), + Type: awstypes.ApiCacheType(d.Get("type").(string)), + ApiCachingBehavior: awstypes.ApiCachingBehavior(d.Get("api_caching_behavior").(string)), + Ttl: int64(d.Get("ttl").(int)), } if v, ok := d.GetOk("at_rest_encryption_enabled"); ok { - params.AtRestEncryptionEnabled = aws.Bool(v.(bool)) + params.AtRestEncryptionEnabled = v.(bool) } if v, ok := d.GetOk("transit_encryption_enabled"); ok { - params.TransitEncryptionEnabled = aws.Bool(v.(bool)) + params.TransitEncryptionEnabled = v.(bool) } - _, err := conn.CreateApiCacheWithContext(ctx, params) + _, err := conn.CreateApiCache(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync API Cache: %s", err) } @@ -99,7 +100,7 @@ func resourceAPICacheCreate(ctx context.Context, d *schema.ResourceData, meta in func resourceAPICacheRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) cache, err := FindAPICacheByID(ctx, conn, d.Id()) if !d.IsNewResource() && tfresource.NotFound(err) { @@ -124,25 +125,25 @@ func resourceAPICacheRead(ctx context.Context, d *schema.ResourceData, meta inte func resourceAPICacheUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) params := &appsync.UpdateApiCacheInput{ ApiId: aws.String(d.Id()), } if d.HasChange("type") { - params.Type = aws.String(d.Get("type").(string)) + params.Type = awstypes.ApiCacheType(d.Get("type").(string)) } if d.HasChange("api_caching_behavior") { - params.ApiCachingBehavior = aws.String(d.Get("api_caching_behavior").(string)) + params.ApiCachingBehavior = awstypes.ApiCachingBehavior(d.Get("api_caching_behavior").(string)) } if d.HasChange("ttl") { - params.Ttl = aws.Int64(int64(d.Get("ttl").(int))) + params.Ttl = int64(d.Get("ttl").(int)) } - _, err := conn.UpdateApiCacheWithContext(ctx, params) + _, err := conn.UpdateApiCache(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "updating Appsync API Cache %q: %s", d.Id(), err) } @@ -156,14 +157,14 @@ func resourceAPICacheUpdate(ctx context.Context, d *schema.ResourceData, meta in func resourceAPICacheDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) input := &appsync.DeleteApiCacheInput{ ApiId: aws.String(d.Id()), } - _, err := conn.DeleteApiCacheWithContext(ctx, input) + _, err := conn.DeleteApiCache(ctx, input) if err != nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return diags } return sdkdiag.AppendErrorf(diags, "deleting Appsync API Cache: %s", err) diff --git a/internal/service/appsync/api_cache_test.go b/internal/service/appsync/api_cache_test.go index 73f805a7649..91e08552c48 100644 --- a/internal/service/appsync/api_cache_test.go +++ b/internal/service/appsync/api_cache_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/aws/aws-sdk-go/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -21,12 +21,12 @@ import ( func testAccAPICache_basic(t *testing.T) { ctx := acctest.Context(t) - var apiCache appsync.ApiCache + var apiCache awstypes.ApiCache resourceName := "aws_appsync_api_cache.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPICacheDestroy(ctx), @@ -51,12 +51,12 @@ func testAccAPICache_basic(t *testing.T) { func testAccAPICache_disappears(t *testing.T) { ctx := acctest.Context(t) - var apiCache appsync.ApiCache + var apiCache awstypes.ApiCache resourceName := "aws_appsync_api_cache.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPICacheDestroy(ctx), @@ -75,7 +75,7 @@ func testAccAPICache_disappears(t *testing.T) { func testAccCheckAPICacheDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_api_cache" { continue @@ -95,14 +95,14 @@ func testAccCheckAPICacheDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckAPICacheExists(ctx context.Context, resourceName string, apiCache *appsync.ApiCache) resource.TestCheckFunc { +func testAccCheckAPICacheExists(ctx context.Context, resourceName string, apiCache *awstypes.ApiCache) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Appsync Api Cache Not found in state: %s", resourceName) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) cache, err := tfappsync.FindAPICacheByID(ctx, conn, rs.Primary.ID) if err != nil { return err diff --git a/internal/service/appsync/api_key.go b/internal/service/appsync/api_key.go index 154306cde7f..ba19ea2cc87 100644 --- a/internal/service/appsync/api_key.go +++ b/internal/service/appsync/api_key.go @@ -10,14 +10,16 @@ import ( "strings" "time" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" + tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" ) // @SDKResource("aws_appsync_api_key") @@ -64,7 +66,7 @@ func ResourceAPIKey() *schema.Resource { func resourceAPIKeyCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID := d.Get("api_id").(string) @@ -74,20 +76,20 @@ func resourceAPIKeyCreate(ctx context.Context, d *schema.ResourceData, meta inte } if v, ok := d.GetOk("expires"); ok { t, _ := time.Parse(time.RFC3339, v.(string)) - params.Expires = aws.Int64(t.Unix()) + params.Expires = t.Unix() } - resp, err := conn.CreateApiKeyWithContext(ctx, params) + resp, err := conn.CreateApiKey(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync API Key: %s", err) } - d.SetId(fmt.Sprintf("%s:%s", apiID, aws.StringValue(resp.ApiKey.Id))) + d.SetId(fmt.Sprintf("%s:%s", apiID, aws.ToString(resp.ApiKey.Id))) return append(diags, resourceAPIKeyRead(ctx, d, meta)...) } func resourceAPIKeyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, keyID, err := DecodeAPIKeyID(d.Id()) if err != nil { @@ -107,13 +109,13 @@ func resourceAPIKeyRead(ctx context.Context, d *schema.ResourceData, meta interf d.Set("api_id", apiID) d.Set("key", key.Id) d.Set("description", key.Description) - d.Set("expires", time.Unix(aws.Int64Value(key.Expires), 0).UTC().Format(time.RFC3339)) + d.Set("expires", time.Unix(key.Expires, 0).UTC().Format(time.RFC3339)) return diags } func resourceAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, keyID, err := DecodeAPIKeyID(d.Id()) if err != nil { @@ -129,10 +131,10 @@ func resourceAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, meta inte } if d.HasChange("expires") { t, _ := time.Parse(time.RFC3339, d.Get("expires").(string)) - params.Expires = aws.Int64(t.Unix()) + params.Expires = t.Unix() } - _, err = conn.UpdateApiKeyWithContext(ctx, params) + _, err = conn.UpdateApiKey(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "updating Appsync API Key (%s): %s", d.Id(), err) } @@ -142,7 +144,7 @@ func resourceAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, meta inte func resourceAPIKeyDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, keyID, err := DecodeAPIKeyID(d.Id()) if err != nil { @@ -153,9 +155,9 @@ func resourceAPIKeyDelete(ctx context.Context, d *schema.ResourceData, meta inte ApiId: aws.String(apiID), Id: aws.String(keyID), } - _, err = conn.DeleteApiKeyWithContext(ctx, input) + _, err = conn.DeleteApiKey(ctx, input) if err != nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return diags } return sdkdiag.AppendErrorf(diags, "deleting Appsync API Key (%s): %s", d.Id(), err) @@ -172,17 +174,17 @@ func DecodeAPIKeyID(id string) (string, string, error) { return parts[0], parts[1], nil } -func GetAPIKey(ctx context.Context, apiID, keyID string, conn *appsync.AppSync) (*appsync.ApiKey, error) { +func GetAPIKey(ctx context.Context, apiID, keyID string, conn *appsync.Client) (*awstypes.ApiKey, error) { input := &appsync.ListApiKeysInput{ ApiId: aws.String(apiID), } for { - resp, err := conn.ListApiKeysWithContext(ctx, input) + resp, err := conn.ListApiKeys(ctx, input) if err != nil { return nil, err } - for _, apiKey := range resp.ApiKeys { - if aws.StringValue(apiKey.Id) == keyID { + for _, apiKey := range tfslices.ToPointers(resp.ApiKeys) { + if aws.ToString(apiKey.Id) == keyID { return apiKey, nil } } diff --git a/internal/service/appsync/api_key_test.go b/internal/service/appsync/api_key_test.go index b9cdc5deb73..93f3e33e048 100644 --- a/internal/service/appsync/api_key_test.go +++ b/internal/service/appsync/api_key_test.go @@ -10,27 +10,27 @@ import ( "time" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/errs" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" "github.com/hashicorp/terraform-provider-aws/names" ) func testAccAPIKey_basic(t *testing.T) { ctx := acctest.Context(t) - var apiKey appsync.ApiKey + var apiKey awstypes.ApiKey dateAfterSevenDays := time.Now().UTC().Add(time.Hour * 24 * time.Duration(7)).Truncate(time.Hour) resourceName := "aws_appsync_api_key.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPIKeyDestroy(ctx), @@ -55,12 +55,12 @@ func testAccAPIKey_basic(t *testing.T) { func testAccAPIKey_description(t *testing.T) { ctx := acctest.Context(t) - var apiKey appsync.ApiKey + var apiKey awstypes.ApiKey resourceName := "aws_appsync_api_key.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPIKeyDestroy(ctx), @@ -90,14 +90,14 @@ func testAccAPIKey_description(t *testing.T) { func testAccAPIKey_expires(t *testing.T) { ctx := acctest.Context(t) - var apiKey appsync.ApiKey + var apiKey awstypes.ApiKey dateAfterTenDays := time.Now().UTC().Add(time.Hour * 24 * time.Duration(10)).Truncate(time.Hour) dateAfterTwentyDays := time.Now().UTC().Add(time.Hour * 24 * time.Duration(20)).Truncate(time.Hour) resourceName := "aws_appsync_api_key.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPIKeyDestroy(ctx), @@ -127,7 +127,7 @@ func testAccAPIKey_expires(t *testing.T) { func testAccCheckAPIKeyDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_api_key" { continue @@ -140,13 +140,13 @@ func testAccCheckAPIKeyDestroy(ctx context.Context) resource.TestCheckFunc { apiKey, err := tfappsync.GetAPIKey(ctx, apiID, keyID, conn) if err == nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil } return err } - if apiKey != nil && aws.StringValue(apiKey.Id) == keyID { + if apiKey != nil && aws.ToString(apiKey.Id) == keyID { return fmt.Errorf("Appsync API Key ID %q still exists", rs.Primary.ID) } @@ -156,7 +156,7 @@ func testAccCheckAPIKeyDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckAPIKeyExists(ctx context.Context, resourceName string, apiKey *appsync.ApiKey) resource.TestCheckFunc { +func testAccCheckAPIKeyExists(ctx context.Context, resourceName string, apiKey *awstypes.ApiKey) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] if !ok { @@ -168,7 +168,7 @@ func testAccCheckAPIKeyExists(ctx context.Context, resourceName string, apiKey * return err } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) key, err := tfappsync.GetAPIKey(ctx, apiID, keyID, conn) if err != nil { return err @@ -184,9 +184,9 @@ func testAccCheckAPIKeyExists(ctx context.Context, resourceName string, apiKey * } } -func testAccCheckAPIKeyExpiresDate(apiKey *appsync.ApiKey, expectedTime time.Time) resource.TestCheckFunc { +func testAccCheckAPIKeyExpiresDate(apiKey *awstypes.ApiKey, expectedTime time.Time) resource.TestCheckFunc { return func(s *terraform.State) error { - apiKeyExpiresTime := time.Unix(aws.Int64Value(apiKey.Expires), 0) + apiKeyExpiresTime := time.Unix(apiKey.Expires, 0) if !apiKeyExpiresTime.Equal(expectedTime) { return fmt.Errorf("Appsync API Key expires difference: got %s and expected %s", apiKeyExpiresTime.Format(time.RFC3339), expectedTime.Format(time.RFC3339)) } diff --git a/internal/service/appsync/datasource.go b/internal/service/appsync/datasource.go index f12dc6f28d5..d9363b3b207 100644 --- a/internal/service/appsync/datasource.go +++ b/internal/service/appsync/datasource.go @@ -10,14 +10,16 @@ import ( "strings" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" @@ -143,10 +145,10 @@ func ResourceDataSource() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "authorization_type": { - Type: schema.TypeString, - Optional: true, - Default: appsync.AuthorizationTypeAwsIam, - ValidateFunc: validation.StringInSlice(appsync.AuthorizationType_Values(), true), + Type: schema.TypeString, + Optional: true, + Default: string(awstypes.AuthorizationTypeAwsIam), + ValidateDiagFunc: enum.Validate[awstypes.AuthorizationType](), }, "aws_iam_config": { Type: schema.TypeList, @@ -253,10 +255,10 @@ func ResourceDataSource() *schema.Resource { }, }, "source_type": { - Type: schema.TypeString, - Optional: true, - Default: appsync.RelationalDatabaseSourceTypeRdsHttpEndpoint, - ValidateFunc: validation.StringInSlice(appsync.RelationalDatabaseSourceType_Values(), true), + Type: schema.TypeString, + Optional: true, + Default: string(awstypes.RelationalDatabaseSourceTypeRdsHttpEndpoint), + ValidateDiagFunc: enum.Validate[awstypes.RelationalDatabaseSourceType](), }, }, }, @@ -268,9 +270,9 @@ func ResourceDataSource() *schema.Resource { ValidateFunc: verify.ValidARN, }, "type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.DataSourceType_Values(), true), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.DataSourceType](), StateFunc: func(v interface{}) string { return strings.ToUpper(v.(string)) }, @@ -281,14 +283,14 @@ func ResourceDataSource() *schema.Resource { func resourceDataSourceCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) region := meta.(*conns.AWSClient).Region name := d.Get("name").(string) input := &appsync.CreateDataSourceInput{ ApiId: aws.String(d.Get("api_id").(string)), Name: aws.String(name), - Type: aws.String(d.Get("type").(string)), + Type: awstypes.DataSourceType(d.Get("type").(string)), } if v, ok := d.GetOk("description"); ok { @@ -327,7 +329,7 @@ func resourceDataSourceCreate(ctx context.Context, d *schema.ResourceData, meta input.ServiceRoleArn = aws.String(v.(string)) } - _, err := conn.CreateDataSourceWithContext(ctx, input) + _, err := conn.CreateDataSource(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync Data Source (%s): %s", name, err) @@ -340,7 +342,7 @@ func resourceDataSourceCreate(ctx context.Context, d *schema.ResourceData, meta func resourceDataSourceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, name, err := DecodeID(d.Id()) @@ -393,7 +395,7 @@ func resourceDataSourceRead(ctx context.Context, d *schema.ResourceData, meta in func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) region := meta.(*conns.AWSClient).Region apiID, name, err := DecodeID(d.Id()) @@ -405,7 +407,7 @@ func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta input := &appsync.UpdateDataSourceInput{ ApiId: aws.String(apiID), Name: aws.String(name), - Type: aws.String(d.Get("type").(string)), + Type: awstypes.DataSourceType(d.Get("type").(string)), } if v, ok := d.GetOk("description"); ok { @@ -440,7 +442,7 @@ func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta input.ServiceRoleArn = aws.String(v.(string)) } - _, err = conn.UpdateDataSourceWithContext(ctx, input) + _, err = conn.UpdateDataSource(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "updating Appsync Data Source (%s): %s", d.Id(), err) @@ -451,7 +453,7 @@ func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta func resourceDataSourceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, name, err := DecodeID(d.Id()) @@ -464,9 +466,9 @@ func resourceDataSourceDelete(ctx context.Context, d *schema.ResourceData, meta Name: aws.String(name), } - _, err = conn.DeleteDataSourceWithContext(ctx, input) + _, err = conn.DeleteDataSource(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return diags } @@ -477,15 +479,15 @@ func resourceDataSourceDelete(ctx context.Context, d *schema.ResourceData, meta return diags } -func FindDataSourceByTwoPartKey(ctx context.Context, conn *appsync.AppSync, apiID, name string) (*appsync.DataSource, error) { +func FindDataSourceByTwoPartKey(ctx context.Context, conn *appsync.Client, apiID, name string) (*awstypes.DataSource, error) { input := &appsync.GetDataSourceInput{ ApiId: aws.String(apiID), Name: aws.String(name), } - output, err := conn.GetDataSourceWithContext(ctx, input) + output, err := conn.GetDataSource(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -511,14 +513,14 @@ func DecodeID(id string) (string, string, error) { return idParts[0], idParts[1], nil } -func expandDynamoDBDataSourceConfig(l []interface{}, currentRegion string) *appsync.DynamodbDataSourceConfig { +func expandDynamoDBDataSourceConfig(l []interface{}, currentRegion string) *awstypes.DynamodbDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.DynamodbDataSourceConfig{ + result := &awstypes.DynamodbDataSourceConfig{ AwsRegion: aws.String(currentRegion), TableName: aws.String(configured["table_name"].(string)), } @@ -528,11 +530,11 @@ func expandDynamoDBDataSourceConfig(l []interface{}, currentRegion string) *apps } if v, ok := configured["use_caller_credentials"]; ok { - result.UseCallerCredentials = aws.Bool(v.(bool)) + result.UseCallerCredentials = v.(bool) } if v, ok := configured["versioned"]; ok { - result.Versioned = aws.Bool(v.(bool)) + result.Versioned = v.(bool) } if v, ok := configured["delta_sync_config"].([]interface{}); ok && len(v) > 0 { @@ -542,21 +544,21 @@ func expandDynamoDBDataSourceConfig(l []interface{}, currentRegion string) *apps return result } -func expandDynamoDBDataSourceDeltaSyncConfig(l []interface{}) *appsync.DeltaSyncConfig { +func expandDynamoDBDataSourceDeltaSyncConfig(l []interface{}) *awstypes.DeltaSyncConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.DeltaSyncConfig{} + result := &awstypes.DeltaSyncConfig{} if v, ok := configured["base_table_ttl"].(int); ok { - result.BaseTableTTL = aws.Int64(int64(v)) + result.BaseTableTTL = int64(v) } if v, ok := configured["delta_sync_table_ttl"].(int); ok { - result.DeltaSyncTableTTL = aws.Int64(int64(v)) + result.DeltaSyncTableTTL = int64(v) } if v, ok := configured["delta_sync_table_name"].(string); ok { @@ -566,23 +568,18 @@ func expandDynamoDBDataSourceDeltaSyncConfig(l []interface{}) *appsync.DeltaSync return result } -func flattenDynamoDBDataSourceConfig(config *appsync.DynamodbDataSourceConfig) []map[string]interface{} { +func flattenDynamoDBDataSourceConfig(config *awstypes.DynamodbDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "region": aws.StringValue(config.AwsRegion), - "table_name": aws.StringValue(config.TableName), - } - - if config.UseCallerCredentials != nil { - result["use_caller_credentials"] = aws.BoolValue(config.UseCallerCredentials) + "region": aws.ToString(config.AwsRegion), + "table_name": aws.ToString(config.TableName), } - if config.Versioned != nil { - result["versioned"] = aws.BoolValue(config.Versioned) - } + result["use_caller_credentials"] = config.UseCallerCredentials + result["versioned"] = config.Versioned if config.DeltaSyncConfig != nil { result["delta_sync_config"] = flattenDynamoDBDataSourceDeltaSyncConfig(config.DeltaSyncConfig) @@ -591,7 +588,7 @@ func flattenDynamoDBDataSourceConfig(config *appsync.DynamodbDataSourceConfig) [ return []map[string]interface{}{result} } -func flattenDynamoDBDataSourceDeltaSyncConfig(config *appsync.DeltaSyncConfig) []map[string]interface{} { +func flattenDynamoDBDataSourceDeltaSyncConfig(config *awstypes.DeltaSyncConfig) []map[string]interface{} { if config == nil { return nil } @@ -599,28 +596,23 @@ func flattenDynamoDBDataSourceDeltaSyncConfig(config *appsync.DeltaSyncConfig) [ result := map[string]interface{}{} if config.DeltaSyncTableName != nil { - result["delta_sync_table_name"] = aws.StringValue(config.DeltaSyncTableName) + result["delta_sync_table_name"] = aws.ToString(config.DeltaSyncTableName) } - if config.BaseTableTTL != nil { - result["base_table_ttl"] = aws.Int64Value(config.BaseTableTTL) - } - - if config.DeltaSyncTableTTL != nil { - result["delta_sync_table_ttl"] = aws.Int64Value(config.DeltaSyncTableTTL) - } + result["base_table_ttl"] = config.BaseTableTTL + result["delta_sync_table_ttl"] = config.DeltaSyncTableTTL return []map[string]interface{}{result} } -func expandElasticsearchDataSourceConfig(l []interface{}, currentRegion string) *appsync.ElasticsearchDataSourceConfig { +func expandElasticsearchDataSourceConfig(l []interface{}, currentRegion string) *awstypes.ElasticsearchDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.ElasticsearchDataSourceConfig{ + result := &awstypes.ElasticsearchDataSourceConfig{ AwsRegion: aws.String(currentRegion), Endpoint: aws.String(configured["endpoint"].(string)), } @@ -632,14 +624,14 @@ func expandElasticsearchDataSourceConfig(l []interface{}, currentRegion string) return result } -func expandOpenSearchServiceDataSourceConfig(l []interface{}, currentRegion string) *appsync.OpenSearchServiceDataSourceConfig { +func expandOpenSearchServiceDataSourceConfig(l []interface{}, currentRegion string) *awstypes.OpenSearchServiceDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.OpenSearchServiceDataSourceConfig{ + result := &awstypes.OpenSearchServiceDataSourceConfig{ AwsRegion: aws.String(currentRegion), Endpoint: aws.String(configured["endpoint"].(string)), } @@ -651,40 +643,40 @@ func expandOpenSearchServiceDataSourceConfig(l []interface{}, currentRegion stri return result } -func flattenElasticsearchDataSourceConfig(config *appsync.ElasticsearchDataSourceConfig) []map[string]interface{} { +func flattenElasticsearchDataSourceConfig(config *awstypes.ElasticsearchDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "endpoint": aws.StringValue(config.Endpoint), - "region": aws.StringValue(config.AwsRegion), + "endpoint": aws.ToString(config.Endpoint), + "region": aws.ToString(config.AwsRegion), } return []map[string]interface{}{result} } -func flattenOpenSearchServiceDataSourceConfig(config *appsync.OpenSearchServiceDataSourceConfig) []map[string]interface{} { +func flattenOpenSearchServiceDataSourceConfig(config *awstypes.OpenSearchServiceDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "endpoint": aws.StringValue(config.Endpoint), - "region": aws.StringValue(config.AwsRegion), + "endpoint": aws.ToString(config.Endpoint), + "region": aws.ToString(config.AwsRegion), } return []map[string]interface{}{result} } -func expandHTTPDataSourceConfig(l []interface{}) *appsync.HttpDataSourceConfig { +func expandHTTPDataSourceConfig(l []interface{}) *awstypes.HttpDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.HttpDataSourceConfig{ + result := &awstypes.HttpDataSourceConfig{ Endpoint: aws.String(configured["endpoint"].(string)), } @@ -695,13 +687,13 @@ func expandHTTPDataSourceConfig(l []interface{}) *appsync.HttpDataSourceConfig { return result } -func flattenHTTPDataSourceConfig(config *appsync.HttpDataSourceConfig) []map[string]interface{} { +func flattenHTTPDataSourceConfig(config *awstypes.HttpDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "endpoint": aws.StringValue(config.Endpoint), + "endpoint": aws.ToString(config.Endpoint), } if config.AuthorizationConfig != nil { @@ -711,15 +703,15 @@ func flattenHTTPDataSourceConfig(config *appsync.HttpDataSourceConfig) []map[str return []map[string]interface{}{result} } -func expandHTTPDataSourceAuthorizationConfig(l []interface{}) *appsync.AuthorizationConfig { +func expandHTTPDataSourceAuthorizationConfig(l []interface{}) *awstypes.AuthorizationConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.AuthorizationConfig{ - AuthorizationType: aws.String(configured["authorization_type"].(string)), + result := &awstypes.AuthorizationConfig{ + AuthorizationType: awstypes.AuthorizationType(configured["authorization_type"].(string)), } if v, ok := configured["aws_iam_config"].([]interface{}); ok && len(v) > 0 { @@ -729,13 +721,13 @@ func expandHTTPDataSourceAuthorizationConfig(l []interface{}) *appsync.Authoriza return result } -func flattenHTTPDataSourceAuthorizationConfig(config *appsync.AuthorizationConfig) []map[string]interface{} { +func flattenHTTPDataSourceAuthorizationConfig(config *awstypes.AuthorizationConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "authorization_type": aws.StringValue(config.AuthorizationType), + "authorization_type": string(config.AuthorizationType), } if config.AwsIamConfig != nil { @@ -745,14 +737,14 @@ func flattenHTTPDataSourceAuthorizationConfig(config *appsync.AuthorizationConfi return []map[string]interface{}{result} } -func expandHTTPDataSourceIAMConfig(l []interface{}) *appsync.AwsIamConfig { +func expandHTTPDataSourceIAMConfig(l []interface{}) *awstypes.AwsIamConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.AwsIamConfig{} + result := &awstypes.AwsIamConfig{} if v, ok := configured["signing_region"].(string); ok && v != "" { result.SigningRegion = aws.String(v) @@ -765,107 +757,107 @@ func expandHTTPDataSourceIAMConfig(l []interface{}) *appsync.AwsIamConfig { return result } -func flattenHTTPDataSourceIAMConfig(config *appsync.AwsIamConfig) []map[string]interface{} { +func flattenHTTPDataSourceIAMConfig(config *awstypes.AwsIamConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "signing_region": aws.StringValue(config.SigningRegion), - "signing_service_name": aws.StringValue(config.SigningServiceName), + "signing_region": aws.ToString(config.SigningRegion), + "signing_service_name": aws.ToString(config.SigningServiceName), } return []map[string]interface{}{result} } -func expandLambdaDataSourceConfig(l []interface{}) *appsync.LambdaDataSourceConfig { +func expandLambdaDataSourceConfig(l []interface{}) *awstypes.LambdaDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.LambdaDataSourceConfig{ + result := &awstypes.LambdaDataSourceConfig{ LambdaFunctionArn: aws.String(configured["function_arn"].(string)), } return result } -func flattenLambdaDataSourceConfig(config *appsync.LambdaDataSourceConfig) []map[string]interface{} { +func flattenLambdaDataSourceConfig(config *awstypes.LambdaDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "function_arn": aws.StringValue(config.LambdaFunctionArn), + "function_arn": aws.ToString(config.LambdaFunctionArn), } return []map[string]interface{}{result} } -func expandRelationalDatabaseDataSourceConfig(l []interface{}, currentRegion string) *appsync.RelationalDatabaseDataSourceConfig { +func expandRelationalDatabaseDataSourceConfig(l []interface{}, currentRegion string) *awstypes.RelationalDatabaseDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.RelationalDatabaseDataSourceConfig{ - RelationalDatabaseSourceType: aws.String(configured["source_type"].(string)), + result := &awstypes.RelationalDatabaseDataSourceConfig{ + RelationalDatabaseSourceType: awstypes.RelationalDatabaseSourceType(configured["source_type"].(string)), RdsHttpEndpointConfig: testAccDataSourceConfig_expandRDSHTTPEndpoint(configured["http_endpoint_config"].([]interface{}), currentRegion), } return result } -func flattenRelationalDatabaseDataSourceConfig(config *appsync.RelationalDatabaseDataSourceConfig) []map[string]interface{} { +func flattenRelationalDatabaseDataSourceConfig(config *awstypes.RelationalDatabaseDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "source_type": aws.StringValue(config.RelationalDatabaseSourceType), + "source_type": string(config.RelationalDatabaseSourceType), "http_endpoint_config": flattenRDSHTTPEndpointConfig(config.RdsHttpEndpointConfig), } return []map[string]interface{}{result} } -func expandEventBridgeDataSourceConfig(l []interface{}) *appsync.EventBridgeDataSourceConfig { +func expandEventBridgeDataSourceConfig(l []interface{}) *awstypes.EventBridgeDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.EventBridgeDataSourceConfig{ + result := &awstypes.EventBridgeDataSourceConfig{ EventBusArn: aws.String(configured["event_bus_arn"].(string)), } return result } -func flattenEventBridgeDataSourceConfig(config *appsync.EventBridgeDataSourceConfig) []map[string]interface{} { +func flattenEventBridgeDataSourceConfig(config *awstypes.EventBridgeDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "event_bus_arn": aws.StringValue(config.EventBusArn), + "event_bus_arn": aws.ToString(config.EventBusArn), } return []map[string]interface{}{result} } -func testAccDataSourceConfig_expandRDSHTTPEndpoint(l []interface{}, currentRegion string) *appsync.RdsHttpEndpointConfig { +func testAccDataSourceConfig_expandRDSHTTPEndpoint(l []interface{}, currentRegion string) *awstypes.RdsHttpEndpointConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.RdsHttpEndpointConfig{ + result := &awstypes.RdsHttpEndpointConfig{ AwsRegion: aws.String(currentRegion), } @@ -892,7 +884,7 @@ func testAccDataSourceConfig_expandRDSHTTPEndpoint(l []interface{}, currentRegio return result } -func flattenRDSHTTPEndpointConfig(config *appsync.RdsHttpEndpointConfig) []map[string]interface{} { +func flattenRDSHTTPEndpointConfig(config *awstypes.RdsHttpEndpointConfig) []map[string]interface{} { if config == nil { return nil } @@ -900,23 +892,23 @@ func flattenRDSHTTPEndpointConfig(config *appsync.RdsHttpEndpointConfig) []map[s result := map[string]interface{}{} if config.AwsRegion != nil { - result["region"] = aws.StringValue(config.AwsRegion) + result["region"] = aws.ToString(config.AwsRegion) } if config.AwsSecretStoreArn != nil { - result["aws_secret_store_arn"] = aws.StringValue(config.AwsSecretStoreArn) + result["aws_secret_store_arn"] = aws.ToString(config.AwsSecretStoreArn) } if config.DatabaseName != nil { - result["database_name"] = aws.StringValue(config.DatabaseName) + result["database_name"] = aws.ToString(config.DatabaseName) } if config.DbClusterIdentifier != nil { - result["db_cluster_identifier"] = aws.StringValue(config.DbClusterIdentifier) + result["db_cluster_identifier"] = aws.ToString(config.DbClusterIdentifier) } if config.Schema != nil { - result["schema"] = aws.StringValue(config.Schema) + result["schema"] = aws.ToString(config.Schema) } return []map[string]interface{}{result} diff --git a/internal/service/appsync/datasource_test.go b/internal/service/appsync/datasource_test.go index d249845be55..767087fa259 100644 --- a/internal/service/appsync/datasource_test.go +++ b/internal/service/appsync/datasource_test.go @@ -9,7 +9,6 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/service/appsync" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -27,7 +26,7 @@ func testAccDataSource_basic(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -64,7 +63,7 @@ func testAccDataSource_description(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -98,7 +97,7 @@ func testAccDataSource_DynamoDB_region(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -134,7 +133,7 @@ func testAccDataSource_DynamoDB_useCallerCredentials(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -171,7 +170,7 @@ func TestAccAppSyncDataSource_Elasticsearch_region(t *testing.T) { // Keep this test Parallel as it takes considerably longer to run than any non-Elasticsearch tests. resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -208,7 +207,7 @@ func TestAccAppSyncDataSource_OpenSearchService_region(t *testing.T) { // Keep this test Parallel as it takes considerably longer to run than any non-OpenSearchService tests. resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -244,7 +243,7 @@ func testAccDataSource_HTTP_endpoint(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -282,7 +281,7 @@ func testAccDataSource_type(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -313,7 +312,7 @@ func testAccDataSource_Type_dynamoDB(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -346,7 +345,7 @@ func TestAccAppSyncDataSource_Type_elasticSearch(t *testing.T) { // Keep this test Parallel as it takes considerably longer to run than any non-Elasticsearch tests. resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -379,7 +378,7 @@ func TestAccAppSyncDataSource_Type_openSearchService(t *testing.T) { // Keep this test Parallel as it takes considerably longer to run than any non-OpenSearchService tests. resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -410,7 +409,7 @@ func testAccDataSource_Type_http(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -439,7 +438,7 @@ func testAccDataSource_Type_httpAuth(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -473,7 +472,7 @@ func testAccDataSource_Type_relationalDatabase(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -502,7 +501,7 @@ func testAccDataSource_Type_relationalDatabaseWithOptions(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -535,7 +534,7 @@ func testAccDataSource_Type_lambda(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -567,7 +566,7 @@ func testAccDataSource_Type_eventBridge(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -597,7 +596,7 @@ func testAccDataSource_Type_none(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -620,7 +619,7 @@ func testAccDataSource_Type_none(t *testing.T) { func testAccCheckDataSourceDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_datasource" { continue @@ -666,7 +665,7 @@ func testAccCheckExistsDataSource(ctx context.Context, name string) resource.Tes return err } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) _, err = tfappsync.FindDataSourceByTwoPartKey(ctx, conn, apiID, name) diff --git a/internal/service/appsync/domain_name.go b/internal/service/appsync/domain_name.go index 89c6e67b1f4..a81d2d4c264 100644 --- a/internal/service/appsync/domain_name.go +++ b/internal/service/appsync/domain_name.go @@ -9,13 +9,14 @@ import ( "log" "time" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" @@ -62,7 +63,7 @@ func ResourceDomainName() *schema.Resource { func resourceDomainNameCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) params := &appsync.CreateDomainNameInput{ CertificateArn: aws.String(d.Get("certificate_arn").(string)), @@ -70,19 +71,19 @@ func resourceDomainNameCreate(ctx context.Context, d *schema.ResourceData, meta DomainName: aws.String(d.Get("domain_name").(string)), } - resp, err := conn.CreateDomainNameWithContext(ctx, params) + resp, err := conn.CreateDomainName(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync Domain Name: %s", err) } - d.SetId(aws.StringValue(resp.DomainNameConfig.DomainName)) + d.SetId(aws.ToString(resp.DomainNameConfig.DomainName)) return append(diags, resourceDomainNameRead(ctx, d, meta)...) } func resourceDomainNameRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) domainName, err := FindDomainNameByID(ctx, conn, d.Id()) if domainName == nil && !d.IsNewResource() { @@ -106,7 +107,7 @@ func resourceDomainNameRead(ctx context.Context, d *schema.ResourceData, meta in func resourceDomainNameUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) params := &appsync.UpdateDomainNameInput{ DomainName: aws.String(d.Id()), @@ -116,7 +117,7 @@ func resourceDomainNameUpdate(ctx context.Context, d *schema.ResourceData, meta params.Description = aws.String(d.Get("description").(string)) } - _, err := conn.UpdateDomainNameWithContext(ctx, params) + _, err := conn.UpdateDomainName(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "updating Appsync Domain Name %q: %s", d.Id(), err) } @@ -126,15 +127,15 @@ func resourceDomainNameUpdate(ctx context.Context, d *schema.ResourceData, meta func resourceDomainNameDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) input := &appsync.DeleteDomainNameInput{ DomainName: aws.String(d.Id()), } err := retry.RetryContext(ctx, 5*time.Minute, func() *retry.RetryError { - _, err := conn.DeleteDomainNameWithContext(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeConcurrentModificationException) { + _, err := conn.DeleteDomainName(ctx, input) + if errs.IsA[*awstypes.ConcurrentModificationException](err) { return retry.RetryableError(fmt.Errorf("deleting Appsync Domain Name %q: %w", d.Id(), err)) } if err != nil { @@ -144,7 +145,7 @@ func resourceDomainNameDelete(ctx context.Context, d *schema.ResourceData, meta return nil }) if tfresource.TimedOut(err) { - _, err = conn.DeleteDomainNameWithContext(ctx, input) + _, err = conn.DeleteDomainName(ctx, input) } if err != nil { return sdkdiag.AppendErrorf(diags, "deleting Appsync Domain Name %q: %s", d.Id(), err) diff --git a/internal/service/appsync/domain_name_api_association.go b/internal/service/appsync/domain_name_api_association.go index 1bff3ff4717..eaefa4dc40f 100644 --- a/internal/service/appsync/domain_name_api_association.go +++ b/internal/service/appsync/domain_name_api_association.go @@ -7,12 +7,13 @@ import ( "context" "log" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" ) @@ -43,19 +44,19 @@ func ResourceDomainNameAPIAssociation() *schema.Resource { func resourceDomainNameAPIAssociationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) params := &appsync.AssociateApiInput{ ApiId: aws.String(d.Get("api_id").(string)), DomainName: aws.String(d.Get("domain_name").(string)), } - resp, err := conn.AssociateApiWithContext(ctx, params) + resp, err := conn.AssociateApi(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync Domain Name API Association: %s", err) } - d.SetId(aws.StringValue(resp.ApiAssociation.DomainName)) + d.SetId(aws.ToString(resp.ApiAssociation.DomainName)) if err := waitDomainNameAPIAssociation(ctx, conn, d.Id()); err != nil { return sdkdiag.AppendErrorf(diags, "waiting for Appsync Domain Name API (%s) Association: %s", d.Id(), err) @@ -66,7 +67,7 @@ func resourceDomainNameAPIAssociationCreate(ctx context.Context, d *schema.Resou func resourceDomainNameAPIAssociationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) association, err := FindDomainNameAPIAssociationByID(ctx, conn, d.Id()) if association == nil && !d.IsNewResource() { @@ -87,14 +88,14 @@ func resourceDomainNameAPIAssociationRead(ctx context.Context, d *schema.Resourc func resourceDomainNameAPIAssociationUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) params := &appsync.AssociateApiInput{ ApiId: aws.String(d.Get("api_id").(string)), DomainName: aws.String(d.Get("domain_name").(string)), } - _, err := conn.AssociateApiWithContext(ctx, params) + _, err := conn.AssociateApi(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync Domain Name API Association: %s", err) } @@ -108,14 +109,14 @@ func resourceDomainNameAPIAssociationUpdate(ctx context.Context, d *schema.Resou func resourceDomainNameAPIAssociationDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) input := &appsync.DisassociateApiInput{ DomainName: aws.String(d.Id()), } - _, err := conn.DisassociateApiWithContext(ctx, input) + _, err := conn.DisassociateApi(ctx, input) if err != nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return diags } return sdkdiag.AppendErrorf(diags, "deleting Appsync Domain Name API Association: %s", err) diff --git a/internal/service/appsync/domain_name_api_association_test.go b/internal/service/appsync/domain_name_api_association_test.go index b80fe4265fb..2b1fc249a8b 100644 --- a/internal/service/appsync/domain_name_api_association_test.go +++ b/internal/service/appsync/domain_name_api_association_test.go @@ -8,28 +8,28 @@ import ( "fmt" "testing" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/errs" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" "github.com/hashicorp/terraform-provider-aws/names" ) func testAccDomainNameAPIAssociation_basic(t *testing.T) { ctx := acctest.Context(t) - var association appsync.ApiAssociation + var association awstypes.ApiAssociation appsyncCertDomain := getCertDomain(t) rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name_api_association.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameAPIAssociationDestroy(ctx), @@ -61,14 +61,14 @@ func testAccDomainNameAPIAssociation_basic(t *testing.T) { func testAccDomainNameAPIAssociation_disappears(t *testing.T) { ctx := acctest.Context(t) - var association appsync.ApiAssociation + var association awstypes.ApiAssociation appsyncCertDomain := getCertDomain(t) rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name_api_association.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameAPIAssociationDestroy(ctx), @@ -87,7 +87,7 @@ func testAccDomainNameAPIAssociation_disappears(t *testing.T) { func testAccCheckDomainNameAPIAssociationDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_domain_name" { continue @@ -95,13 +95,13 @@ func testAccCheckDomainNameAPIAssociationDestroy(ctx context.Context) resource.T association, err := tfappsync.FindDomainNameAPIAssociationByID(ctx, conn, rs.Primary.ID) if err == nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil } return err } - if association != nil && aws.StringValue(association.DomainName) == rs.Primary.ID { + if association != nil && aws.ToString(association.DomainName) == rs.Primary.ID { return fmt.Errorf("Appsync Domain Name ID %q still exists", rs.Primary.ID) } @@ -111,13 +111,13 @@ func testAccCheckDomainNameAPIAssociationDestroy(ctx context.Context) resource.T } } -func testAccCheckDomainNameAPIAssociationExists(ctx context.Context, resourceName string, DomainNameAPIAssociation *appsync.ApiAssociation) resource.TestCheckFunc { +func testAccCheckDomainNameAPIAssociationExists(ctx context.Context, resourceName string, DomainNameAPIAssociation *awstypes.ApiAssociation) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Appsync Domain Name Not found in state: %s", resourceName) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) association, err := tfappsync.FindDomainNameAPIAssociationByID(ctx, conn, rs.Primary.ID) if err != nil { diff --git a/internal/service/appsync/domain_name_test.go b/internal/service/appsync/domain_name_test.go index f06968b1e2f..732ac780e9c 100644 --- a/internal/service/appsync/domain_name_test.go +++ b/internal/service/appsync/domain_name_test.go @@ -8,21 +8,21 @@ import ( "fmt" "testing" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/errs" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" "github.com/hashicorp/terraform-provider-aws/names" ) func testAccDomainName_basic(t *testing.T) { ctx := acctest.Context(t) - var domainName appsync.DomainNameConfig + var domainName awstypes.DomainNameConfig appsyncCertDomain := getCertDomain(t) rName := sdkacctest.RandString(8) @@ -30,7 +30,7 @@ func testAccDomainName_basic(t *testing.T) { resourceName := "aws_appsync_domain_name.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameDestroy(ctx), @@ -54,14 +54,14 @@ func testAccDomainName_basic(t *testing.T) { func testAccDomainName_description(t *testing.T) { ctx := acctest.Context(t) - var domainName appsync.DomainNameConfig + var domainName awstypes.DomainNameConfig appsyncCertDomain := getCertDomain(t) rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameDestroy(ctx), @@ -91,14 +91,14 @@ func testAccDomainName_description(t *testing.T) { func testAccDomainName_disappears(t *testing.T) { ctx := acctest.Context(t) - var domainName appsync.DomainNameConfig + var domainName awstypes.DomainNameConfig appsyncCertDomain := getCertDomain(t) rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameDestroy(ctx), @@ -117,7 +117,7 @@ func testAccDomainName_disappears(t *testing.T) { func testAccCheckDomainNameDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_domain_name" { continue @@ -125,13 +125,13 @@ func testAccCheckDomainNameDestroy(ctx context.Context) resource.TestCheckFunc { domainName, err := tfappsync.FindDomainNameByID(ctx, conn, rs.Primary.ID) if err == nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil } return err } - if domainName != nil && aws.StringValue(domainName.DomainName) == rs.Primary.ID { + if domainName != nil && aws.ToString(domainName.DomainName) == rs.Primary.ID { return fmt.Errorf("Appsync Domain Name ID %q still exists", rs.Primary.ID) } @@ -141,13 +141,13 @@ func testAccCheckDomainNameDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckDomainNameExists(ctx context.Context, resourceName string, domainName *appsync.DomainNameConfig) resource.TestCheckFunc { +func testAccCheckDomainNameExists(ctx context.Context, resourceName string, domainName *awstypes.DomainNameConfig) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Appsync Domain Name Not found in state: %s", resourceName) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) domain, err := tfappsync.FindDomainNameByID(ctx, conn, rs.Primary.ID) if err != nil { diff --git a/internal/service/appsync/find.go b/internal/service/appsync/find.go index 05906df4040..10b26f2ca65 100644 --- a/internal/service/appsync/find.go +++ b/internal/service/appsync/find.go @@ -6,20 +6,21 @@ package appsync import ( "context" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) -func FindAPICacheByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.ApiCache, error) { +func FindAPICacheByID(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiCache, error) { input := &appsync.GetApiCacheInput{ ApiId: aws.String(id), } - out, err := conn.GetApiCacheWithContext(ctx, input) + out, err := conn.GetApiCache(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -37,13 +38,13 @@ func FindAPICacheByID(ctx context.Context, conn *appsync.AppSync, id string) (*a return out.ApiCache, nil } -func FindDomainNameByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.DomainNameConfig, error) { +func FindDomainNameByID(ctx context.Context, conn *appsync.Client, id string) (*awstypes.DomainNameConfig, error) { input := &appsync.GetDomainNameInput{ DomainName: aws.String(id), } - out, err := conn.GetDomainNameWithContext(ctx, input) + out, err := conn.GetDomainName(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -61,13 +62,13 @@ func FindDomainNameByID(ctx context.Context, conn *appsync.AppSync, id string) ( return out.DomainNameConfig, nil } -func FindDomainNameAPIAssociationByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.ApiAssociation, error) { +func FindDomainNameAPIAssociationByID(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiAssociation, error) { input := &appsync.GetApiAssociationInput{ DomainName: aws.String(id), } - out, err := conn.GetApiAssociationWithContext(ctx, input) + out, err := conn.GetApiAssociation(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -85,16 +86,16 @@ func FindDomainNameAPIAssociationByID(ctx context.Context, conn *appsync.AppSync return out.ApiAssociation, nil } -func FindTypeByThreePartKey(ctx context.Context, conn *appsync.AppSync, apiID, format, name string) (*appsync.Type, error) { +func FindTypeByThreePartKey(ctx context.Context, conn *appsync.Client, apiID, format, name string) (*awstypes.Type, error) { input := &appsync.GetTypeInput{ ApiId: aws.String(apiID), - Format: aws.String(format), + Format: awstypes.TypeDefinitionFormat(format), TypeName: aws.String(name), } - output, err := conn.GetTypeWithContext(ctx, input) + output, err := conn.GetType(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, diff --git a/internal/service/appsync/function.go b/internal/service/appsync/function.go index f1135e3ce7b..c94071cbe81 100644 --- a/internal/service/appsync/function.go +++ b/internal/service/appsync/function.go @@ -10,13 +10,15 @@ import ( "strings" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/verify" ) @@ -95,9 +97,9 @@ func ResourceFunction() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.RuntimeName_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.RuntimeName](), }, "runtime_version": { Type: schema.TypeString, @@ -113,14 +115,14 @@ func ResourceFunction() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "conflict_detection": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice(appsync.ConflictDetectionType_Values(), false), + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.ConflictDetectionType](), }, "conflict_handler": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice(appsync.ConflictHandlerType_Values(), false), + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.ConflictHandlerType](), }, "lambda_conflict_handler_config": { Type: schema.TypeList, @@ -145,7 +147,7 @@ func ResourceFunction() *schema.Resource { func resourceFunctionCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID := d.Get("api_id").(string) @@ -174,7 +176,7 @@ func resourceFunctionCreate(ctx context.Context, d *schema.ResourceData, meta in } if v, ok := d.GetOkExists("max_batch_size"); ok { - input.MaxBatchSize = aws.Int64(int64(v.(int))) + input.MaxBatchSize = int32(v.(int)) } if v, ok := d.GetOk("sync_config"); ok && len(v.([]interface{})) > 0 { @@ -185,19 +187,19 @@ func resourceFunctionCreate(ctx context.Context, d *schema.ResourceData, meta in input.Runtime = expandRuntime(v.([]interface{})) } - resp, err := conn.CreateFunctionWithContext(ctx, input) + resp, err := conn.CreateFunction(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "creating AppSync Function: %s", err) } - d.SetId(fmt.Sprintf("%s-%s", apiID, aws.StringValue(resp.FunctionConfiguration.FunctionId))) + d.SetId(fmt.Sprintf("%s-%s", apiID, aws.ToString(resp.FunctionConfiguration.FunctionId))) return append(diags, resourceFunctionRead(ctx, d, meta)...) } func resourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, functionID, err := DecodeFunctionID(d.Id()) if err != nil { @@ -209,8 +211,8 @@ func resourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta inte FunctionId: aws.String(functionID), } - resp, err := conn.GetFunctionWithContext(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) && !d.IsNewResource() { + resp, err := conn.GetFunction(ctx, input) + if errs.IsA[*awstypes.NotFoundException](err) && !d.IsNewResource() { log.Printf("[WARN] AppSync Function (%s) not found, removing from state", d.Id()) d.SetId("") return diags @@ -245,7 +247,7 @@ func resourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta inte func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, functionID, err := DecodeFunctionID(d.Id()) if err != nil { @@ -277,7 +279,7 @@ func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta in } if v, ok := d.GetOk("max_batch_size"); ok { - input.MaxBatchSize = aws.Int64(int64(v.(int))) + input.MaxBatchSize = int32(v.(int)) } if v, ok := d.GetOk("sync_config"); ok && len(v.([]interface{})) > 0 { @@ -288,7 +290,7 @@ func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta in input.Runtime = expandRuntime(v.([]interface{})) } - _, err = conn.UpdateFunctionWithContext(ctx, input) + _, err = conn.UpdateFunction(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "updating AppSync Function (%s): %s", d.Id(), err) } @@ -298,7 +300,7 @@ func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta in func resourceFunctionDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, functionID, err := DecodeFunctionID(d.Id()) if err != nil { @@ -310,8 +312,8 @@ func resourceFunctionDelete(ctx context.Context, d *schema.ResourceData, meta in FunctionId: aws.String(functionID), } - _, err = conn.DeleteFunctionWithContext(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + _, err = conn.DeleteFunction(ctx, input) + if errs.IsA[*awstypes.NotFoundException](err) { return diags } if err != nil { @@ -329,17 +331,17 @@ func DecodeFunctionID(id string) (string, string, error) { return idParts[0], idParts[1], nil } -func expandRuntime(l []interface{}) *appsync.AppSyncRuntime { +func expandRuntime(l []interface{}) *awstypes.AppSyncRuntime { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.AppSyncRuntime{} + result := &awstypes.AppSyncRuntime{} if v, ok := configured["name"].(string); ok { - result.Name = aws.String(v) + result.Name = awstypes.RuntimeName(v) } if v, ok := configured["runtime_version"].(string); ok { @@ -349,34 +351,34 @@ func expandRuntime(l []interface{}) *appsync.AppSyncRuntime { return result } -func flattenRuntime(config *appsync.AppSyncRuntime) []map[string]interface{} { +func flattenRuntime(config *awstypes.AppSyncRuntime) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "name": aws.StringValue(config.Name), - "runtime_version": aws.StringValue(config.RuntimeVersion), + "name": string(config.Name), + "runtime_version": aws.ToString(config.RuntimeVersion), } return []map[string]interface{}{result} } -func expandSyncConfig(l []interface{}) *appsync.SyncConfig { +func expandSyncConfig(l []interface{}) *awstypes.SyncConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.SyncConfig{} + result := &awstypes.SyncConfig{} if v, ok := configured["conflict_detection"].(string); ok { - result.ConflictDetection = aws.String(v) + result.ConflictDetection = awstypes.ConflictDetectionType(v) } if v, ok := configured["conflict_handler"].(string); ok { - result.ConflictHandler = aws.String(v) + result.ConflictHandler = awstypes.ConflictHandlerType(v) } if v, ok := configured["lambda_conflict_handler_config"].([]interface{}); ok && len(v) > 0 { @@ -386,28 +388,28 @@ func expandSyncConfig(l []interface{}) *appsync.SyncConfig { return result } -func flattenSyncConfig(config *appsync.SyncConfig) []map[string]interface{} { +func flattenSyncConfig(config *awstypes.SyncConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "conflict_detection": aws.StringValue(config.ConflictDetection), - "conflict_handler": aws.StringValue(config.ConflictHandler), + "conflict_detection": string(config.ConflictDetection), + "conflict_handler": string(config.ConflictHandler), "lambda_conflict_handler_config": flattenLambdaConflictHandlerConfig(config.LambdaConflictHandlerConfig), } return []map[string]interface{}{result} } -func expandLambdaConflictHandlerConfig(l []interface{}) *appsync.LambdaConflictHandlerConfig { +func expandLambdaConflictHandlerConfig(l []interface{}) *awstypes.LambdaConflictHandlerConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &appsync.LambdaConflictHandlerConfig{} + result := &awstypes.LambdaConflictHandlerConfig{} if v, ok := configured["lambda_conflict_handler_arn"].(string); ok { result.LambdaConflictHandlerArn = aws.String(v) @@ -416,13 +418,13 @@ func expandLambdaConflictHandlerConfig(l []interface{}) *appsync.LambdaConflictH return result } -func flattenLambdaConflictHandlerConfig(config *appsync.LambdaConflictHandlerConfig) []map[string]interface{} { +func flattenLambdaConflictHandlerConfig(config *awstypes.LambdaConflictHandlerConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "lambda_conflict_handler_arn": aws.StringValue(config.LambdaConflictHandlerArn), + "lambda_conflict_handler_arn": aws.ToString(config.LambdaConflictHandlerArn), } return []map[string]interface{}{result} diff --git a/internal/service/appsync/function_test.go b/internal/service/appsync/function_test.go index d546ca3efa0..e413e54a13b 100644 --- a/internal/service/appsync/function_test.go +++ b/internal/service/appsync/function_test.go @@ -9,14 +9,15 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/errs" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -27,10 +28,10 @@ func testAccFunction_basic(t *testing.T) { rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) rName3 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config appsync.FunctionConfiguration + var config awstypes.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -70,10 +71,10 @@ func testAccFunction_code(t *testing.T) { rName1 := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config appsync.FunctionConfiguration + var config awstypes.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -113,10 +114,10 @@ func testAccFunction_syncConfig(t *testing.T) { ctx := acctest.Context(t) rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_function.test" - var config appsync.FunctionConfiguration + var config awstypes.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -144,10 +145,10 @@ func testAccFunction_description(t *testing.T) { rName1 := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config appsync.FunctionConfiguration + var config awstypes.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -180,10 +181,10 @@ func testAccFunction_responseMappingTemplate(t *testing.T) { rName1 := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config appsync.FunctionConfiguration + var config awstypes.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -208,10 +209,10 @@ func testAccFunction_disappears(t *testing.T) { rName1 := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config appsync.FunctionConfiguration + var config awstypes.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -230,7 +231,7 @@ func testAccFunction_disappears(t *testing.T) { func testAccCheckFunctionDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_function" { continue @@ -246,9 +247,9 @@ func testAccCheckFunctionDestroy(ctx context.Context) resource.TestCheckFunc { FunctionId: aws.String(functionID), } - _, err = conn.GetFunctionWithContext(ctx, input) + _, err = conn.GetFunction(ctx, input) if err != nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil } return err @@ -258,14 +259,14 @@ func testAccCheckFunctionDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckFunctionExists(ctx context.Context, name string, config *appsync.FunctionConfiguration) resource.TestCheckFunc { +func testAccCheckFunctionExists(ctx context.Context, name string, config *awstypes.FunctionConfiguration) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] if !ok { return fmt.Errorf("Not found: %s", name) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) apiID, functionID, err := tfappsync.DecodeFunctionID(rs.Primary.ID) if err != nil { @@ -277,7 +278,7 @@ func testAccCheckFunctionExists(ctx context.Context, name string, config *appsyn FunctionId: aws.String(functionID), } - output, err := conn.GetFunctionWithContext(ctx, input) + output, err := conn.GetFunction(ctx, input) if err != nil { return err diff --git a/internal/service/appsync/generate.go b/internal/service/appsync/generate.go index 3efb706569b..93bd9782d71 100644 --- a/internal/service/appsync/generate.go +++ b/internal/service/appsync/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 -ListTags -ServiceTagsMap -UpdateTags -KVTValues -SkipTypesImp //go:generate go run ../../generate/servicepackage/main.go // ONLY generate directives and package declaration! Do not add anything else to this file. diff --git a/internal/service/appsync/graphql_api.go b/internal/service/appsync/graphql_api.go index a2d3f26bb61..4145f4f9a81 100644 --- a/internal/service/appsync/graphql_api.go +++ b/internal/service/appsync/graphql_api.go @@ -11,14 +11,16 @@ import ( "time" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -50,9 +52,9 @@ func ResourceGraphQLAPI() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "authentication_type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.AuthenticationType_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.AuthenticationType](), }, "lambda_authorizer_config": { Type: schema.TypeList, @@ -132,15 +134,15 @@ func ResourceGraphQLAPI() *schema.Resource { Computed: true, }, "authentication_type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.AuthenticationType_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.AuthenticationType](), }, "introspection_config": { - Type: schema.TypeString, - Optional: true, - Default: appsync.GraphQLApiIntrospectionConfigEnabled, - ValidateFunc: validation.StringInSlice(appsync.GraphQLApiIntrospectionConfig_Values(), false), + Type: schema.TypeString, + Optional: true, + Default: awstypes.GraphQLApiIntrospectionConfigEnabled, + ValidateDiagFunc: enum.Validate[awstypes.GraphQLApiIntrospectionConfig](), }, "lambda_authorizer_config": { Type: schema.TypeList, @@ -182,9 +184,9 @@ func ResourceGraphQLAPI() *schema.Resource { Default: false, }, "field_log_level": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.FieldLogLevel_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.FieldLogLevel](), }, }, }, @@ -264,9 +266,9 @@ func ResourceGraphQLAPI() *schema.Resource { Computed: true, }, "default_action": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.DefaultAction_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.DefaultAction](), }, "user_pool_id": { Type: schema.TypeString, @@ -276,11 +278,11 @@ func ResourceGraphQLAPI() *schema.Resource { }, }, "visibility": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - Default: appsync.GraphQLApiVisibilityGlobal, - ValidateFunc: validation.StringInSlice(appsync.GraphQLApiVisibility_Values(), false), + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Default: string(awstypes.GraphQLApiVisibilityGlobal), + ValidateDiagFunc: enum.Validate[awstypes.GraphQLApiVisibility](), }, "xray_enabled": { Type: schema.TypeBool, @@ -294,11 +296,11 @@ func ResourceGraphQLAPI() *schema.Resource { func resourceGraphQLAPICreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) name := d.Get("name").(string) input := &appsync.CreateGraphqlApiInput{ - AuthenticationType: aws.String(d.Get("authentication_type").(string)), + AuthenticationType: awstypes.AuthenticationType(d.Get("authentication_type").(string)), Name: aws.String(name), Tags: getTagsIn(ctx), } @@ -324,32 +326,32 @@ func resourceGraphQLAPICreate(ctx context.Context, d *schema.ResourceData, meta } if v, ok := d.GetOk("introspection_config"); ok { - input.IntrospectionConfig = aws.String(v.(string)) + input.IntrospectionConfig = awstypes.GraphQLApiIntrospectionConfig(v.(string)) } if v, ok := d.GetOk("query_depth_limit"); ok { - input.QueryDepthLimit = aws.Int64(int64(v.(int))) + input.QueryDepthLimit = int32(v.(int)) } if v, ok := d.GetOk("resolver_count_limit"); ok { - input.ResolverCountLimit = aws.Int64(int64(v.(int))) + input.ResolverCountLimit = int32(v.(int)) } if v, ok := d.GetOk("xray_enabled"); ok { - input.XrayEnabled = aws.Bool(v.(bool)) + input.XrayEnabled = v.(bool) } if v, ok := d.GetOk("visibility"); ok { - input.Visibility = aws.String(v.(string)) + input.Visibility = awstypes.GraphQLApiVisibility(v.(string)) } - output, err := conn.CreateGraphqlApiWithContext(ctx, input) + output, err := conn.CreateGraphqlApi(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "creating AppSync GraphQL API (%s): %s", name, err) } - d.SetId(aws.StringValue(output.GraphqlApi.ApiId)) + d.SetId(aws.ToString(output.GraphqlApi.ApiId)) if v, ok := d.GetOk("schema"); ok { if err := putSchema(ctx, conn, d.Id(), v.(string), d.Timeout(schema.TimeoutCreate)); err != nil { @@ -362,7 +364,7 @@ func resourceGraphQLAPICreate(ctx context.Context, d *schema.ResourceData, meta func resourceGraphQLAPIRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) api, err := FindGraphQLAPIByID(ctx, conn, d.Id()) @@ -394,7 +396,7 @@ func resourceGraphQLAPIRead(ctx context.Context, d *schema.ResourceData, meta in d.Set("name", api.Name) d.Set("query_depth_limit", api.QueryDepthLimit) d.Set("resolver_count_limit", api.ResolverCountLimit) - d.Set("uris", aws.StringValueMap(api.Uris)) + d.Set("uris", api.Uris) if err := d.Set("user_pool_config", flattenGraphQLAPIUserPoolConfig(api.UserPoolConfig)); err != nil { return sdkdiag.AppendErrorf(diags, "setting user_pool_config: %s", err) } @@ -410,12 +412,12 @@ func resourceGraphQLAPIRead(ctx context.Context, d *schema.ResourceData, meta in func resourceGraphQLAPIUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) if d.HasChangesExcept("tags", "tags_all") { input := &appsync.UpdateGraphqlApiInput{ ApiId: aws.String(d.Id()), - AuthenticationType: aws.String(d.Get("authentication_type").(string)), + AuthenticationType: awstypes.AuthenticationType(d.Get("authentication_type").(string)), Name: aws.String(d.Get("name").(string)), } @@ -440,22 +442,22 @@ func resourceGraphQLAPIUpdate(ctx context.Context, d *schema.ResourceData, meta } if v, ok := d.GetOk("introspection_config"); ok { - input.IntrospectionConfig = aws.String(v.(string)) + input.IntrospectionConfig = awstypes.GraphQLApiIntrospectionConfig(v.(string)) } if v, ok := d.GetOk("query_depth_limit"); ok { - input.QueryDepthLimit = aws.Int64(int64(v.(int))) + input.QueryDepthLimit = int32(v.(int)) } if v, ok := d.GetOk("resolver_count_limit"); ok { - input.ResolverCountLimit = aws.Int64(int64(v.(int))) + input.ResolverCountLimit = int32(v.(int)) } if v, ok := d.GetOk("xray_enabled"); ok { - input.XrayEnabled = aws.Bool(v.(bool)) + input.XrayEnabled = v.(bool) } - _, err := conn.UpdateGraphqlApiWithContext(ctx, input) + _, err := conn.UpdateGraphqlApi(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "updating AppSync GraphQL API (%s): %s", d.Id(), err) @@ -475,14 +477,14 @@ func resourceGraphQLAPIUpdate(ctx context.Context, d *schema.ResourceData, meta func resourceGraphQLAPIDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) log.Printf("[DEBUG] Deleting AppSync GraphQL API: %s", d.Id()) - _, err := conn.DeleteGraphqlApiWithContext(ctx, &appsync.DeleteGraphqlApiInput{ + _, err := conn.DeleteGraphqlApi(ctx, &appsync.DeleteGraphqlApiInput{ ApiId: aws.String(d.Id()), }) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return diags } @@ -493,13 +495,13 @@ func resourceGraphQLAPIDelete(ctx context.Context, d *schema.ResourceData, meta return diags } -func putSchema(ctx context.Context, conn *appsync.AppSync, apiID, definition string, timeout time.Duration) error { +func putSchema(ctx context.Context, conn *appsync.Client, apiID, definition string, timeout time.Duration) error { input := &appsync.StartSchemaCreationInput{ ApiId: aws.String(apiID), Definition: ([]byte)(definition), } - _, err := conn.StartSchemaCreationWithContext(ctx, input) + _, err := conn.StartSchemaCreation(ctx, input) if err != nil { return fmt.Errorf("creating AppSync GraphQL API (%s) schema: %w", apiID, err) @@ -512,14 +514,14 @@ func putSchema(ctx context.Context, conn *appsync.AppSync, apiID, definition str return nil } -func FindGraphQLAPIByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.GraphqlApi, error) { +func FindGraphQLAPIByID(ctx context.Context, conn *appsync.Client, id string) (*awstypes.GraphqlApi, error) { input := &appsync.GetGraphqlApiInput{ ApiId: aws.String(id), } - output, err := conn.GetGraphqlApiWithContext(ctx, input) + output, err := conn.GetGraphqlApi(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -537,14 +539,14 @@ func FindGraphQLAPIByID(ctx context.Context, conn *appsync.AppSync, id string) ( return output.GraphqlApi, nil } -func findSchemaCreationStatusByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.GetSchemaCreationStatusOutput, error) { +func findSchemaCreationStatusByID(ctx context.Context, conn *appsync.Client, id string) (*appsync.GetSchemaCreationStatusOutput, error) { input := &appsync.GetSchemaCreationStatusInput{ ApiId: aws.String(id), } - output, err := conn.GetSchemaCreationStatusWithContext(ctx, input) + output, err := conn.GetSchemaCreationStatus(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -562,7 +564,7 @@ func findSchemaCreationStatusByID(ctx context.Context, conn *appsync.AppSync, id return output, nil } -func statusSchemaCreation(ctx context.Context, conn *appsync.AppSync, id string) retry.StateRefreshFunc { +func statusSchemaCreation(ctx context.Context, conn *appsync.Client, id string) retry.StateRefreshFunc { return func() (interface{}, string, error) { output, err := findSchemaCreationStatusByID(ctx, conn, id) @@ -574,14 +576,14 @@ func statusSchemaCreation(ctx context.Context, conn *appsync.AppSync, id string) return nil, "", err } - return output, aws.StringValue(output.Status), nil + return output, string(output.Status), nil } } -func waitSchemaCreated(ctx context.Context, conn *appsync.AppSync, id string, timeout time.Duration) error { +func waitSchemaCreated(ctx context.Context, conn *appsync.Client, id string, timeout time.Duration) error { stateConf := &retry.StateChangeConf{ - Pending: []string{appsync.SchemaStatusProcessing}, - Target: []string{appsync.SchemaStatusActive, appsync.SchemaStatusSuccess}, + Pending: enum.Slice(awstypes.SchemaStatusProcessing), + Target: enum.Slice(awstypes.SchemaStatusActive, awstypes.SchemaStatusSuccess), Refresh: statusSchemaCreation(ctx, conn, id), Timeout: timeout, } @@ -589,41 +591,41 @@ func waitSchemaCreated(ctx context.Context, conn *appsync.AppSync, id string, ti outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*appsync.GetSchemaCreationStatusOutput); ok { - tfresource.SetLastError(err, errors.New(aws.StringValue(output.Details))) + tfresource.SetLastError(err, errors.New(aws.ToString(output.Details))) } return err } -func expandGraphQLAPILogConfig(l []interface{}) *appsync.LogConfig { +func expandGraphQLAPILogConfig(l []interface{}) *awstypes.LogConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - logConfig := &appsync.LogConfig{ + logConfig := &awstypes.LogConfig{ CloudWatchLogsRoleArn: aws.String(m["cloudwatch_logs_role_arn"].(string)), - FieldLogLevel: aws.String(m["field_log_level"].(string)), - ExcludeVerboseContent: aws.Bool(m["exclude_verbose_content"].(bool)), + FieldLogLevel: awstypes.FieldLogLevel(m["field_log_level"].(string)), + ExcludeVerboseContent: m["exclude_verbose_content"].(bool), } return logConfig } -func expandGraphQLAPIOpenIDConnectConfig(l []interface{}) *appsync.OpenIDConnectConfig { +func expandGraphQLAPIOpenIDConnectConfig(l []interface{}) *awstypes.OpenIDConnectConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - openIDConnectConfig := &appsync.OpenIDConnectConfig{ + openIDConnectConfig := &awstypes.OpenIDConnectConfig{ Issuer: aws.String(m["issuer"].(string)), } if v, ok := m["auth_ttl"].(int); ok && v != 0 { - openIDConnectConfig.AuthTTL = aws.Int64(int64(v)) + openIDConnectConfig.AuthTTL = int64(v) } if v, ok := m["client_id"].(string); ok && v != "" { @@ -631,22 +633,22 @@ func expandGraphQLAPIOpenIDConnectConfig(l []interface{}) *appsync.OpenIDConnect } if v, ok := m["iat_ttl"].(int); ok && v != 0 { - openIDConnectConfig.IatTTL = aws.Int64(int64(v)) + openIDConnectConfig.IatTTL = int64(v) } return openIDConnectConfig } -func expandGraphQLAPIUserPoolConfig(l []interface{}, currentRegion string) *appsync.UserPoolConfig { +func expandGraphQLAPIUserPoolConfig(l []interface{}, currentRegion string) *awstypes.UserPoolConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - userPoolConfig := &appsync.UserPoolConfig{ + userPoolConfig := &awstypes.UserPoolConfig{ AwsRegion: aws.String(currentRegion), - DefaultAction: aws.String(m["default_action"].(string)), + DefaultAction: awstypes.DefaultAction(m["default_action"].(string)), UserPoolId: aws.String(m["user_pool_id"].(string)), } @@ -661,15 +663,15 @@ func expandGraphQLAPIUserPoolConfig(l []interface{}, currentRegion string) *apps return userPoolConfig } -func expandGraphQLAPILambdaAuthorizerConfig(l []interface{}) *appsync.LambdaAuthorizerConfig { +func expandGraphQLAPILambdaAuthorizerConfig(l []interface{}) *awstypes.LambdaAuthorizerConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - lambdaAuthorizerConfig := &appsync.LambdaAuthorizerConfig{ - AuthorizerResultTtlInSeconds: aws.Int64(int64(m["authorizer_result_ttl_in_seconds"].(int))), + lambdaAuthorizerConfig := &awstypes.LambdaAuthorizerConfig{ + AuthorizerResultTtlInSeconds: int32(m["authorizer_result_ttl_in_seconds"].(int)), AuthorizerUri: aws.String(m["authorizer_uri"].(string)), } @@ -680,20 +682,20 @@ func expandGraphQLAPILambdaAuthorizerConfig(l []interface{}) *appsync.LambdaAuth return lambdaAuthorizerConfig } -func expandGraphQLAPIAdditionalAuthProviders(items []interface{}, currentRegion string) []*appsync.AdditionalAuthenticationProvider { +func expandGraphQLAPIAdditionalAuthProviders(items []interface{}, currentRegion string) []awstypes.AdditionalAuthenticationProvider { if len(items) < 1 { return nil } - additionalAuthProviders := make([]*appsync.AdditionalAuthenticationProvider, 0, len(items)) + additionalAuthProviders := make([]awstypes.AdditionalAuthenticationProvider, 0, len(items)) for _, l := range items { if l == nil { continue } m := l.(map[string]interface{}) - additionalAuthProvider := &appsync.AdditionalAuthenticationProvider{ - AuthenticationType: aws.String(m["authentication_type"].(string)), + additionalAuthProvider := awstypes.AdditionalAuthenticationProvider{ + AuthenticationType: awstypes.AuthenticationType(m["authentication_type"].(string)), } if v, ok := m["openid_connect_config"]; ok { @@ -714,14 +716,14 @@ func expandGraphQLAPIAdditionalAuthProviders(items []interface{}, currentRegion return additionalAuthProviders } -func expandGraphQLAPICognitoUserPoolConfig(l []interface{}, currentRegion string) *appsync.CognitoUserPoolConfig { +func expandGraphQLAPICognitoUserPoolConfig(l []interface{}, currentRegion string) *awstypes.CognitoUserPoolConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - userPoolConfig := &appsync.CognitoUserPoolConfig{ + userPoolConfig := &awstypes.CognitoUserPoolConfig{ AwsRegion: aws.String(currentRegion), UserPoolId: aws.String(m["user_pool_id"].(string)), } @@ -737,76 +739,72 @@ func expandGraphQLAPICognitoUserPoolConfig(l []interface{}, currentRegion string return userPoolConfig } -func flattenGraphQLAPILogConfig(logConfig *appsync.LogConfig) []interface{} { +func flattenGraphQLAPILogConfig(logConfig *awstypes.LogConfig) []interface{} { if logConfig == nil { return []interface{}{} } m := map[string]interface{}{ - "cloudwatch_logs_role_arn": aws.StringValue(logConfig.CloudWatchLogsRoleArn), - "field_log_level": aws.StringValue(logConfig.FieldLogLevel), - "exclude_verbose_content": aws.BoolValue(logConfig.ExcludeVerboseContent), + "cloudwatch_logs_role_arn": aws.ToString(logConfig.CloudWatchLogsRoleArn), + "field_log_level": string(logConfig.FieldLogLevel), + "exclude_verbose_content": logConfig.ExcludeVerboseContent, } return []interface{}{m} } -func flattenGraphQLAPIOpenIDConnectConfig(openIDConnectConfig *appsync.OpenIDConnectConfig) []interface{} { +func flattenGraphQLAPIOpenIDConnectConfig(openIDConnectConfig *awstypes.OpenIDConnectConfig) []interface{} { if openIDConnectConfig == nil { return []interface{}{} } m := map[string]interface{}{ - "auth_ttl": aws.Int64Value(openIDConnectConfig.AuthTTL), - "client_id": aws.StringValue(openIDConnectConfig.ClientId), - "iat_ttl": aws.Int64Value(openIDConnectConfig.IatTTL), - "issuer": aws.StringValue(openIDConnectConfig.Issuer), + "auth_ttl": openIDConnectConfig.AuthTTL, + "client_id": aws.ToString(openIDConnectConfig.ClientId), + "iat_ttl": openIDConnectConfig.IatTTL, + "issuer": aws.ToString(openIDConnectConfig.Issuer), } return []interface{}{m} } -func flattenGraphQLAPIUserPoolConfig(userPoolConfig *appsync.UserPoolConfig) []interface{} { +func flattenGraphQLAPIUserPoolConfig(userPoolConfig *awstypes.UserPoolConfig) []interface{} { if userPoolConfig == nil { return []interface{}{} } m := map[string]interface{}{ - "aws_region": aws.StringValue(userPoolConfig.AwsRegion), - "default_action": aws.StringValue(userPoolConfig.DefaultAction), - "user_pool_id": aws.StringValue(userPoolConfig.UserPoolId), + "aws_region": aws.ToString(userPoolConfig.AwsRegion), + "default_action": string(userPoolConfig.DefaultAction), + "user_pool_id": aws.ToString(userPoolConfig.UserPoolId), } if userPoolConfig.AppIdClientRegex != nil { - m["app_id_client_regex"] = aws.StringValue(userPoolConfig.AppIdClientRegex) + m["app_id_client_regex"] = aws.ToString(userPoolConfig.AppIdClientRegex) } return []interface{}{m} } -func flattenGraphQLAPILambdaAuthorizerConfig(lambdaAuthorizerConfig *appsync.LambdaAuthorizerConfig) []interface{} { +func flattenGraphQLAPILambdaAuthorizerConfig(lambdaAuthorizerConfig *awstypes.LambdaAuthorizerConfig) []interface{} { if lambdaAuthorizerConfig == nil { return []interface{}{} } m := map[string]interface{}{ - "authorizer_uri": aws.StringValue(lambdaAuthorizerConfig.AuthorizerUri), + "authorizer_uri": aws.ToString(lambdaAuthorizerConfig.AuthorizerUri), } - if lambdaAuthorizerConfig.AuthorizerResultTtlInSeconds != nil { - m["authorizer_result_ttl_in_seconds"] = aws.Int64Value(lambdaAuthorizerConfig.AuthorizerResultTtlInSeconds) - } else { - m["authorizer_result_ttl_in_seconds"] = DefaultAuthorizerResultTTLInSeconds - } + m["authorizer_result_ttl_in_seconds"] = lambdaAuthorizerConfig.AuthorizerResultTtlInSeconds if lambdaAuthorizerConfig.IdentityValidationExpression != nil { - m["identity_validation_expression"] = aws.StringValue(lambdaAuthorizerConfig.IdentityValidationExpression) + m["identity_validation_expression"] = aws.ToString(lambdaAuthorizerConfig.IdentityValidationExpression) } return []interface{}{m} } -func flattenGraphQLAPIAdditionalAuthenticationProviders(additionalAuthenticationProviders []*appsync.AdditionalAuthenticationProvider) []interface{} { +func flattenGraphQLAPIAdditionalAuthenticationProviders(additionalAuthenticationProviders []awstypes.AdditionalAuthenticationProvider) []interface{} { if len(additionalAuthenticationProviders) == 0 { return []interface{}{} } @@ -814,7 +812,7 @@ func flattenGraphQLAPIAdditionalAuthenticationProviders(additionalAuthentication result := make([]interface{}, len(additionalAuthenticationProviders)) for i, provider := range additionalAuthenticationProviders { result[i] = map[string]interface{}{ - "authentication_type": aws.StringValue(provider.AuthenticationType), + "authentication_type": string(provider.AuthenticationType), "lambda_authorizer_config": flattenGraphQLAPILambdaAuthorizerConfig(provider.LambdaAuthorizerConfig), "openid_connect_config": flattenGraphQLAPIOpenIDConnectConfig(provider.OpenIDConnectConfig), "user_pool_config": flattenGraphQLAPICognitoUserPoolConfig(provider.UserPoolConfig), @@ -824,18 +822,18 @@ func flattenGraphQLAPIAdditionalAuthenticationProviders(additionalAuthentication return result } -func flattenGraphQLAPICognitoUserPoolConfig(userPoolConfig *appsync.CognitoUserPoolConfig) []interface{} { +func flattenGraphQLAPICognitoUserPoolConfig(userPoolConfig *awstypes.CognitoUserPoolConfig) []interface{} { if userPoolConfig == nil { return []interface{}{} } m := map[string]interface{}{ - "aws_region": aws.StringValue(userPoolConfig.AwsRegion), - "user_pool_id": aws.StringValue(userPoolConfig.UserPoolId), + "aws_region": aws.ToString(userPoolConfig.AwsRegion), + "user_pool_id": aws.ToString(userPoolConfig.UserPoolId), } if userPoolConfig.AppIdClientRegex != nil { - m["app_id_client_regex"] = aws.StringValue(userPoolConfig.AppIdClientRegex) + m["app_id_client_regex"] = aws.ToString(userPoolConfig.AppIdClientRegex) } return []interface{}{m} diff --git a/internal/service/appsync/graphql_api_test.go b/internal/service/appsync/graphql_api_test.go index 5d4ad783877..ae3ec0c52f5 100644 --- a/internal/service/appsync/graphql_api_test.go +++ b/internal/service/appsync/graphql_api_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -23,12 +23,12 @@ import ( func testAccGraphQLAPI_basic(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -66,12 +66,12 @@ func testAccGraphQLAPI_basic(t *testing.T) { func testAccGraphQLAPI_disappears(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -90,12 +90,12 @@ func testAccGraphQLAPI_disappears(t *testing.T) { func testAccGraphQLAPI_schema(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -137,12 +137,12 @@ func testAccGraphQLAPI_schema(t *testing.T) { func testAccGraphQLAPI_authenticationType(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -172,12 +172,12 @@ func testAccGraphQLAPI_authenticationType(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_apiKey(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -202,12 +202,12 @@ func testAccGraphQLAPI_AuthenticationType_apiKey(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_iam(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -232,13 +232,13 @@ func testAccGraphQLAPI_AuthenticationType_iam(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_amazonCognitoUserPools(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -265,12 +265,12 @@ func testAccGraphQLAPI_AuthenticationType_amazonCognitoUserPools(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_openIDConnect(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -295,13 +295,13 @@ func testAccGraphQLAPI_AuthenticationType_openIDConnect(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_lambda(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -328,13 +328,13 @@ func testAccGraphQLAPI_AuthenticationType_lambda(t *testing.T) { func testAccGraphQLAPI_log(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) iamRoleResourceName := "aws_iam_role.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -360,13 +360,13 @@ func testAccGraphQLAPI_log(t *testing.T) { func testAccGraphQLAPI_Log_fieldLogLevel(t *testing.T) { ctx := acctest.Context(t) - var api1, api2, api3 appsync.GraphqlApi + var api1, api2, api3 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) iamRoleResourceName := "aws_iam_role.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -412,13 +412,13 @@ func testAccGraphQLAPI_Log_fieldLogLevel(t *testing.T) { func testAccGraphQLAPI_Log_excludeVerboseContent(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) iamRoleResourceName := "aws_iam_role.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -455,12 +455,12 @@ func testAccGraphQLAPI_Log_excludeVerboseContent(t *testing.T) { func testAccGraphQLAPI_OpenIDConnect_authTTL(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -496,12 +496,12 @@ func testAccGraphQLAPI_OpenIDConnect_authTTL(t *testing.T) { func testAccGraphQLAPI_OpenIDConnect_clientID(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -537,12 +537,12 @@ func testAccGraphQLAPI_OpenIDConnect_clientID(t *testing.T) { func testAccGraphQLAPI_OpenIDConnect_iatTTL(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -578,12 +578,12 @@ func testAccGraphQLAPI_OpenIDConnect_iatTTL(t *testing.T) { func testAccGraphQLAPI_OpenIDConnect_issuer(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -617,13 +617,13 @@ func testAccGraphQLAPI_OpenIDConnect_issuer(t *testing.T) { func testAccGraphQLAPI_name(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName1 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) rName2 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -648,13 +648,13 @@ func testAccGraphQLAPI_name(t *testing.T) { func testAccGraphQLAPI_UserPool_region(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -692,13 +692,13 @@ func testAccGraphQLAPI_UserPool_region(t *testing.T) { func testAccGraphQLAPI_UserPool_defaultAction(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -736,13 +736,13 @@ func testAccGraphQLAPI_UserPool_defaultAction(t *testing.T) { func testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerURI(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -776,13 +776,13 @@ func testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerURI(t *testing.T) { func testAccGraphQLAPI_LambdaAuthorizerConfig_identityValidationExpression(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -818,12 +818,12 @@ func testAccGraphQLAPI_LambdaAuthorizerConfig_identityValidationExpression(t *te func testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerResultTTLInSeconds(t *testing.T) { ctx := acctest.Context(t) - var api1, api2, api3, api4 appsync.GraphqlApi + var api1, api2, api3, api4 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -875,12 +875,12 @@ func testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerResultTTLInSeconds(t *te func testAccGraphQLAPI_tags(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -921,12 +921,12 @@ func testAccGraphQLAPI_tags(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_apiKey(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -956,12 +956,12 @@ func testAccGraphQLAPI_AdditionalAuthentication_apiKey(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_iam(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -991,13 +991,13 @@ func testAccGraphQLAPI_AdditionalAuthentication_iam(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_cognitoUserPools(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1028,12 +1028,12 @@ func testAccGraphQLAPI_AdditionalAuthentication_cognitoUserPools(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_openIDConnect(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1064,13 +1064,13 @@ func testAccGraphQLAPI_AdditionalAuthentication_openIDConnect(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_lambda(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1103,14 +1103,14 @@ func testAccGraphQLAPI_AdditionalAuthentication_lambda(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_multiple(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1155,12 +1155,12 @@ func testAccGraphQLAPI_AdditionalAuthentication_multiple(t *testing.T) { func testAccGraphQLAPI_xrayEnabled(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1185,12 +1185,12 @@ func testAccGraphQLAPI_xrayEnabled(t *testing.T) { func testAccGraphQLAPI_visibility(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1214,12 +1214,12 @@ func testAccGraphQLAPI_visibility(t *testing.T) { func testAccGraphQLAPI_introspectionConfig(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1242,12 +1242,12 @@ func testAccGraphQLAPI_introspectionConfig(t *testing.T) { func testAccGraphQLAPI_queryDepthLimit(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1270,12 +1270,12 @@ func testAccGraphQLAPI_queryDepthLimit(t *testing.T) { func testAccGraphQLAPI_resolverCountLimit(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1298,7 +1298,7 @@ func testAccGraphQLAPI_resolverCountLimit(t *testing.T) { func testAccCheckGraphQLAPIDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_graphql_api" { continue @@ -1320,7 +1320,7 @@ func testAccCheckGraphQLAPIDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckGraphQLAPIExists(ctx context.Context, n string, v *appsync.GraphqlApi) resource.TestCheckFunc { +func testAccCheckGraphQLAPIExists(ctx context.Context, n string, v *awstypes.GraphqlApi) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -1331,7 +1331,7 @@ func testAccCheckGraphQLAPIExists(ctx context.Context, n string, v *appsync.Grap return fmt.Errorf("No AppSync GraphQL API ID is set") } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) output, err := tfappsync.FindGraphQLAPIByID(ctx, conn, rs.Primary.ID) @@ -1352,9 +1352,9 @@ func testAccCheckGraphQLAPITypeExists(ctx context.Context, n, typeName string) r return fmt.Errorf("Not found: %s", n) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) - _, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.ID, appsync.OutputTypeSdl, typeName) + _, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.ID, string(awstypes.OutputTypeSdl), typeName) return err } diff --git a/internal/service/appsync/resolver.go b/internal/service/appsync/resolver.go index c010003b5b8..3c626aeabdc 100644 --- a/internal/service/appsync/resolver.go +++ b/internal/service/appsync/resolver.go @@ -10,13 +10,15 @@ import ( "strings" "time" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -83,10 +85,10 @@ func ResourceResolver() *schema.Resource { ForceNew: true, }, "kind": { - Type: schema.TypeString, - Optional: true, - Default: appsync.ResolverKindUnit, - ValidateFunc: validation.StringInSlice(appsync.ResolverKind_Values(), true), + Type: schema.TypeString, + Optional: true, + Default: awstypes.ResolverKindUnit, + ValidateDiagFunc: enum.Validate[awstypes.ResolverKind](), }, "max_batch_size": { Type: schema.TypeInt, @@ -126,9 +128,9 @@ func ResourceResolver() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.RuntimeName_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.RuntimeName](), }, "runtime_version": { Type: schema.TypeString, @@ -144,14 +146,14 @@ func ResourceResolver() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "conflict_detection": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice(appsync.ConflictDetectionType_Values(), false), + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.ConflictDetectionType](), }, "conflict_handler": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice(appsync.ConflictHandlerType_Values(), false), + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.ConflictHandlerType](), }, "lambda_conflict_handler_config": { Type: schema.TypeList, @@ -181,13 +183,13 @@ func ResourceResolver() *schema.Resource { func resourceResolverCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, typeName, fieldName := d.Get("api_id").(string), d.Get("type").(string), d.Get("field").(string) input := &appsync.CreateResolverInput{ ApiId: aws.String(apiID), FieldName: aws.String(fieldName), - Kind: aws.String(d.Get("kind").(string)), + Kind: awstypes.ResolverKind(d.Get("kind").(string)), TypeName: aws.String(typeName), } @@ -196,7 +198,7 @@ func resourceResolverCreate(ctx context.Context, d *schema.ResourceData, meta in } if v, ok := d.GetOkExists("max_batch_size"); ok { - input.MaxBatchSize = aws.Int64(int64(v.(int))) + input.MaxBatchSize = int32(v.(int)) } if v, ok := d.GetOk("sync_config"); ok && len(v.([]interface{})) > 0 { @@ -231,9 +233,9 @@ func resourceResolverCreate(ctx context.Context, d *schema.ResourceData, meta in conns.GlobalMutexKV.Lock(mutexKey) defer conns.GlobalMutexKV.Unlock(mutexKey) - _, err := tfresource.RetryWhenAWSErrCodeEquals(ctx, 2*time.Minute, func() (interface{}, error) { - return conn.CreateResolverWithContext(ctx, input) - }, appsync.ErrCodeConcurrentModificationException) + _, err := tfresource.RetryWhenIsA[*awstypes.ConcurrentModificationException](ctx, 2*time.Minute, func() (interface{}, error) { + return conn.CreateResolver(ctx, input) + }) if err != nil { return sdkdiag.AppendErrorf(diags, "creating AppSync Resolver: %s", err) @@ -246,7 +248,7 @@ func resourceResolverCreate(ctx context.Context, d *schema.ResourceData, meta in func resourceResolverRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, typeName, fieldName, err := DecodeResolverID(d.Id()) if err != nil { @@ -259,9 +261,9 @@ func resourceResolverRead(ctx context.Context, d *schema.ResourceData, meta inte FieldName: aws.String(fieldName), } - resp, err := conn.GetResolverWithContext(ctx, input) + resp, err := conn.GetResolver(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) && !d.IsNewResource() { + if errs.IsA[*awstypes.NotFoundException](err) && !d.IsNewResource() { log.Printf("[WARN] AppSync Resolver (%s) not found, removing from state", d.Id()) d.SetId("") return diags @@ -304,7 +306,7 @@ func resourceResolverRead(ctx context.Context, d *schema.ResourceData, meta inte func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, typeName, fieldName, err := DecodeResolverID(d.Id()) if err != nil { @@ -314,7 +316,7 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in input := &appsync.UpdateResolverInput{ ApiId: aws.String(apiID), FieldName: aws.String(fieldName), - Kind: aws.String(d.Get("kind").(string)), + Kind: awstypes.ResolverKind(d.Get("kind").(string)), TypeName: aws.String(typeName), } @@ -328,8 +330,8 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in if v, ok := d.GetOk("pipeline_config"); ok { config := v.([]interface{})[0].(map[string]interface{}) - input.PipelineConfig = &appsync.PipelineConfig{ - Functions: flex.ExpandStringList(config["functions"].([]interface{})), + input.PipelineConfig = &awstypes.PipelineConfig{ + Functions: flex.ExpandStringValueList(config["functions"].([]interface{})), } } @@ -346,7 +348,7 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in } if v, ok := d.GetOkExists("max_batch_size"); ok { - input.MaxBatchSize = aws.Int64(int64(v.(int))) + input.MaxBatchSize = int32(v.(int)) } if v, ok := d.GetOk("sync_config"); ok && len(v.([]interface{})) > 0 { @@ -361,9 +363,9 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in conns.GlobalMutexKV.Lock(mutexKey) defer conns.GlobalMutexKV.Unlock(mutexKey) - _, err = tfresource.RetryWhenAWSErrCodeEquals(ctx, 2*time.Minute, func() (interface{}, error) { - return conn.UpdateResolverWithContext(ctx, input) - }, appsync.ErrCodeConcurrentModificationException) + _, err = tfresource.RetryWhenIsA[*awstypes.ConcurrentModificationException](ctx, 2*time.Minute, func() (interface{}, error) { + return conn.UpdateResolver(ctx, input) + }) if err != nil { return sdkdiag.AppendErrorf(diags, "updating AppSync Resolver (%s): %s", d.Id(), err) @@ -374,7 +376,7 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in func resourceResolverDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, typeName, fieldName, err := DecodeResolverID(d.Id()) if err != nil { @@ -391,11 +393,11 @@ func resourceResolverDelete(ctx context.Context, d *schema.ResourceData, meta in conns.GlobalMutexKV.Lock(mutexKey) defer conns.GlobalMutexKV.Unlock(mutexKey) - _, err = tfresource.RetryWhenAWSErrCodeEquals(ctx, 2*time.Minute, func() (interface{}, error) { - return conn.DeleteResolverWithContext(ctx, input) - }, appsync.ErrCodeConcurrentModificationException) + _, err = tfresource.RetryWhenIsA[*awstypes.ConcurrentModificationException](ctx, 2*time.Minute, func() (interface{}, error) { + return conn.DeleteResolver(ctx, input) + }) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return diags } @@ -414,41 +416,41 @@ func DecodeResolverID(id string) (string, string, string, error) { return idParts[0], idParts[1], idParts[2], nil } -func expandResolverCachingConfig(l []interface{}) *appsync.CachingConfig { +func expandResolverCachingConfig(l []interface{}) *awstypes.CachingConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - cachingConfig := &appsync.CachingConfig{ - CachingKeys: flex.ExpandStringSet(m["caching_keys"].(*schema.Set)), + cachingConfig := &awstypes.CachingConfig{ + CachingKeys: flex.ExpandStringValueSet(m["caching_keys"].(*schema.Set)), } if v, ok := m["ttl"].(int); ok && v != 0 { - cachingConfig.Ttl = aws.Int64(int64(v)) + cachingConfig.Ttl = int64(v) } return cachingConfig } -func expandPipelineConfig(l []interface{}) *appsync.PipelineConfig { +func expandPipelineConfig(l []interface{}) *awstypes.PipelineConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - config := &appsync.PipelineConfig{} + config := &awstypes.PipelineConfig{} if v, ok := m["functions"].([]interface{}); ok && len(v) > 0 { - config.Functions = flex.ExpandStringList(v) + config.Functions = flex.ExpandStringValueList(v) } return config } -func flattenPipelineConfig(c *appsync.PipelineConfig) []interface{} { +func flattenPipelineConfig(c *awstypes.PipelineConfig) []interface{} { if c == nil { return nil } @@ -458,24 +460,24 @@ func flattenPipelineConfig(c *appsync.PipelineConfig) []interface{} { } m := map[string]interface{}{ - "functions": flex.FlattenStringList(c.Functions), + "functions": flex.FlattenStringValueList(c.Functions), } return []interface{}{m} } -func flattenCachingConfig(c *appsync.CachingConfig) []interface{} { +func flattenCachingConfig(c *awstypes.CachingConfig) []interface{} { if c == nil { return nil } - if len(c.CachingKeys) == 0 && aws.Int64Value(c.Ttl) == 0 { + if len(c.CachingKeys) == 0 && c.Ttl == 0 { return nil } m := map[string]interface{}{ - "caching_keys": flex.FlattenStringSet(c.CachingKeys), - "ttl": int(aws.Int64Value(c.Ttl)), + "caching_keys": flex.FlattenStringValueSet(c.CachingKeys), + "ttl": int(c.Ttl), } return []interface{}{m} diff --git a/internal/service/appsync/resolver_test.go b/internal/service/appsync/resolver_test.go index 34174d2ba7c..5b2d8fea0c6 100644 --- a/internal/service/appsync/resolver_test.go +++ b/internal/service/appsync/resolver_test.go @@ -9,26 +9,27 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/errs" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" "github.com/hashicorp/terraform-provider-aws/names" ) func testAccResolver_basic(t *testing.T) { ctx := acctest.Context(t) - var resolver1 appsync.Resolver + var resolver1 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -56,12 +57,12 @@ func testAccResolver_basic(t *testing.T) { func testAccResolver_code(t *testing.T) { ctx := acctest.Context(t) - var resolver1 appsync.Resolver + var resolver1 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -86,12 +87,12 @@ func testAccResolver_code(t *testing.T) { func testAccResolver_syncConfig(t *testing.T) { ctx := acctest.Context(t) - var resolver1 appsync.Resolver + var resolver1 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -116,14 +117,14 @@ func testAccResolver_syncConfig(t *testing.T) { func testAccResolver_disappears(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi - var resolver1 appsync.Resolver + var api1 awstypes.GraphqlApi + var resolver1 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) appsyncGraphqlApiResourceName := "aws_appsync_graphql_api.test" resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -143,12 +144,12 @@ func testAccResolver_disappears(t *testing.T) { func testAccResolver_dataSource(t *testing.T) { ctx := acctest.Context(t) - var resolver1, resolver2 appsync.Resolver + var resolver1, resolver2 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -178,12 +179,12 @@ func testAccResolver_dataSource(t *testing.T) { func testAccResolver_DataSource_lambda(t *testing.T) { ctx := acctest.Context(t) - var resolver appsync.Resolver + var resolver awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -206,12 +207,12 @@ func testAccResolver_DataSource_lambda(t *testing.T) { func testAccResolver_requestTemplate(t *testing.T) { ctx := acctest.Context(t) - var resolver1, resolver2 appsync.Resolver + var resolver1, resolver2 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -241,12 +242,12 @@ func testAccResolver_requestTemplate(t *testing.T) { func testAccResolver_responseTemplate(t *testing.T) { ctx := acctest.Context(t) - var resolver1, resolver2 appsync.Resolver + var resolver1, resolver2 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -276,12 +277,12 @@ func testAccResolver_responseTemplate(t *testing.T) { func testAccResolver_multipleResolvers(t *testing.T) { ctx := acctest.Context(t) - var resolver appsync.Resolver + var resolver awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -307,12 +308,12 @@ func testAccResolver_multipleResolvers(t *testing.T) { func testAccResolver_pipeline(t *testing.T) { ctx := acctest.Context(t) - var resolver appsync.Resolver + var resolver awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -336,12 +337,12 @@ func testAccResolver_pipeline(t *testing.T) { func testAccResolver_caching(t *testing.T) { ctx := acctest.Context(t) - var resolver appsync.Resolver + var resolver awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -365,7 +366,7 @@ func testAccResolver_caching(t *testing.T) { func testAccCheckResolverDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_resolver" { continue @@ -383,9 +384,9 @@ func testAccCheckResolverDestroy(ctx context.Context) resource.TestCheckFunc { FieldName: aws.String(fieldName), } - _, err = conn.GetResolverWithContext(ctx, input) + _, err = conn.GetResolver(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { continue } @@ -397,7 +398,7 @@ func testAccCheckResolverDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckResolverExists(ctx context.Context, name string, resolver *appsync.Resolver) resource.TestCheckFunc { +func testAccCheckResolverExists(ctx context.Context, name string, resolver *awstypes.Resolver) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] if !ok { @@ -413,7 +414,7 @@ func testAccCheckResolverExists(ctx context.Context, name string, resolver *apps return err } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) input := &appsync.GetResolverInput{ ApiId: aws.String(apiID), @@ -421,7 +422,7 @@ func testAccCheckResolverExists(ctx context.Context, name string, resolver *apps FieldName: aws.String(fieldName), } - output, err := conn.GetResolverWithContext(ctx, input) + output, err := conn.GetResolver(ctx, input) if err != nil { return err diff --git a/internal/service/appsync/service_endpoints_gen_test.go b/internal/service/appsync/service_endpoints_gen_test.go index 0b88fc469ac..59d891160d1 100644 --- a/internal/service/appsync/service_endpoints_gen_test.go +++ b/internal/service/appsync/service_endpoints_gen_test.go @@ -4,17 +4,17 @@ package appsync_test import ( "context" + "errors" "fmt" "maps" - "net/url" "os" "path/filepath" "reflect" "strings" "testing" - "github.com/aws/aws-sdk-go/aws/endpoints" - appsync_sdkv1 "github.com/aws/aws-sdk-go/service/appsync" + aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + appsync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appsync" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -212,32 +212,42 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) string { - r := endpoints.DefaultResolver() + r := appsync_sdkv2.NewDefaultEndpointResolverV2() - ep, err := r.EndpointFor(appsync_sdkv1.EndpointsID, region) + ep, err := r.ResolveEndpoint(context.Background(), appsync_sdkv2.EndpointParameters{ + Region: aws_sdkv2.String(region), + }) if err != nil { return err.Error() } - url, _ := url.Parse(ep.URL) - - if url.Path == "" { - url.Path = "/" + if ep.URI.Path == "" { + ep.URI.Path = "/" } - return url.String() + return ep.URI.String() } func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) string { t.Helper() - client := meta.AppSyncConn(ctx) - - req, _ := client.ListDomainNamesRequest(&appsync_sdkv1.ListDomainNamesInput{}) + var endpoint string - req.HTTPRequest.URL.Path = "/" + client := meta.AppSyncClient(ctx) - endpoint := req.HTTPRequest.URL.String() + _, err := client.ListDomainNames(ctx, &appsync_sdkv2.ListDomainNamesInput{}, + func(opts *appsync_sdkv2.Options) { + opts.APIOptions = append(opts.APIOptions, + addRetrieveEndpointURLMiddleware(t, &endpoint), + addCancelRequestMiddleware(), + ) + }, + ) + if err == nil { + t.Fatal("Expected an error, got none") + } else if !errors.Is(err, errCancelOperation) { + t.Fatalf("Unexpected error: %s", err) + } return endpoint } diff --git a/internal/service/appsync/service_package.go b/internal/service/appsync/service_package.go deleted file mode 100644 index 53db884512f..00000000000 --- a/internal/service/appsync/service_package.go +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -package appsync - -import ( - "context" - - aws_sdkv1 "github.com/aws/aws-sdk-go/aws" - request_sdkv1 "github.com/aws/aws-sdk-go/aws/request" - appsync_sdkv1 "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" -) - -// CustomizeConn customizes a new AWS SDK for Go v1 client for this service package's AWS API. -func (p *servicePackage) CustomizeConn(ctx context.Context, conn *appsync_sdkv1.AppSync) (*appsync_sdkv1.AppSync, error) { - conn.Handlers.Retry.PushBack(func(r *request_sdkv1.Request) { - if r.Operation.Name == "CreateGraphqlApi" { - if tfawserr.ErrMessageContains(r.Error, appsync_sdkv1.ErrCodeConcurrentModificationException, "a GraphQL API creation is already in progress") { - r.Retryable = aws_sdkv1.Bool(true) - } - } - }) - - return conn, nil -} diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index 47f71305f26..6704bf86344 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -5,9 +5,8 @@ package appsync import ( "context" - aws_sdkv1 "github.com/aws/aws-sdk-go/aws" - session_sdkv1 "github.com/aws/aws-sdk-go/aws/session" - appsync_sdkv1 "github.com/aws/aws-sdk-go/service/appsync" + aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + appsync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appsync" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -77,11 +76,15 @@ func (p *servicePackage) ServicePackageName() string { return names.AppSync } -// NewConn returns a new AWS SDK for Go v1 client for this service package's AWS API. -func (p *servicePackage) NewConn(ctx context.Context, config map[string]any) (*appsync_sdkv1.AppSync, error) { - sess := config["session"].(*session_sdkv1.Session) +// NewClient returns a new AWS SDK for Go v2 client for this service package's AWS API. +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*appsync_sdkv2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) - return appsync_sdkv1.New(sess.Copy(&aws_sdkv1.Config{Endpoint: aws_sdkv1.String(config["endpoint"].(string))})), nil + return appsync_sdkv2.NewFromConfig(cfg, func(o *appsync_sdkv2.Options) { + if endpoint := config["endpoint"].(string); endpoint != "" { + o.BaseEndpoint = aws_sdkv2.String(endpoint) + } + }), nil } func ServicePackage(ctx context.Context) conns.ServicePackage { diff --git a/internal/service/appsync/status.go b/internal/service/appsync/status.go index 7b3ecbbd352..c735e4d8544 100644 --- a/internal/service/appsync/status.go +++ b/internal/service/appsync/status.go @@ -6,13 +6,12 @@ package appsync import ( "context" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" + "github.com/aws/aws-sdk-go-v2/service/appsync" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) -func StatusAPICache(ctx context.Context, conn *appsync.AppSync, name string) retry.StateRefreshFunc { +func StatusAPICache(ctx context.Context, conn *appsync.Client, name string) retry.StateRefreshFunc { return func() (interface{}, string, error) { output, err := FindAPICacheByID(ctx, conn, name) @@ -24,11 +23,11 @@ func StatusAPICache(ctx context.Context, conn *appsync.AppSync, name string) ret return nil, "", err } - return output, aws.StringValue(output.Status), nil + return output, string(output.Status), nil } } -func statusDomainNameAPIAssociation(ctx context.Context, conn *appsync.AppSync, id string) retry.StateRefreshFunc { +func statusDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, id string) retry.StateRefreshFunc { return func() (interface{}, string, error) { output, err := FindDomainNameAPIAssociationByID(ctx, conn, id) @@ -40,6 +39,6 @@ func statusDomainNameAPIAssociation(ctx context.Context, conn *appsync.AppSync, return nil, "", err } - return output, aws.StringValue(output.AssociationStatus), nil + return output, string(output.AssociationStatus), nil } } diff --git a/internal/service/appsync/sweep.go b/internal/service/appsync/sweep.go index 459b5265365..41d57566332 100644 --- a/internal/service/appsync/sweep.go +++ b/internal/service/appsync/sweep.go @@ -7,8 +7,8 @@ import ( "fmt" "log" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/sweep" @@ -41,14 +41,14 @@ func sweepGraphQLAPIs(region string) error { if err != nil { return fmt.Errorf("Error getting client: %s", err) } - conn := client.AppSyncConn(ctx) + conn := client.AppSyncClient(ctx) sweepResources := make([]sweep.Sweepable, 0) var errs *multierror.Error input := &appsync.ListGraphqlApisInput{} for { - output, err := conn.ListGraphqlApisWithContext(ctx, input) + output, err := conn.ListGraphqlApis(ctx, input) if awsv1.SkipSweepError(err) { log.Printf("[WARN] Skipping AppSync GraphQL API sweep for %s: %s", region, err) return nil @@ -65,13 +65,13 @@ func sweepGraphQLAPIs(region string) error { r := ResourceGraphQLAPI() d := r.Data(nil) - id := aws.StringValue(graphAPI.ApiId) + id := aws.ToString(graphAPI.ApiId) d.SetId(id) sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client)) } - if aws.StringValue(output.NextToken) == "" { + if aws.ToString(output.NextToken) == "" { break } @@ -96,14 +96,14 @@ func sweepDomainNames(region string) error { if err != nil { return fmt.Errorf("Error getting client: %s", err) } - conn := client.AppSyncConn(ctx) + conn := client.AppSyncClient(ctx) sweepResources := make([]sweep.Sweepable, 0) var errs *multierror.Error input := &appsync.ListDomainNamesInput{} for { - output, err := conn.ListDomainNamesWithContext(ctx, input) + output, err := conn.ListDomainNames(ctx, input) if awsv1.SkipSweepError(err) { log.Printf("[WARN] Skipping AppSync Domain Name sweep for %s: %s", region, err) return nil @@ -120,13 +120,13 @@ func sweepDomainNames(region string) error { r := ResourceDomainName() d := r.Data(nil) - id := aws.StringValue(dm.DomainName) + id := aws.ToString(dm.DomainName) d.SetId(id) sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client)) } - if aws.StringValue(output.NextToken) == "" { + if aws.ToString(output.NextToken) == "" { break } @@ -151,14 +151,14 @@ func sweepDomainNameAssociations(region string) error { if err != nil { return fmt.Errorf("Error getting client: %s", err) } - conn := client.AppSyncConn(ctx) + conn := client.AppSyncClient(ctx) sweepResources := make([]sweep.Sweepable, 0) var errs *multierror.Error input := &appsync.ListDomainNamesInput{} for { - output, err := conn.ListDomainNamesWithContext(ctx, input) + output, err := conn.ListDomainNames(ctx, input) if awsv1.SkipSweepError(err) { log.Printf("[WARN] Skipping AppSync Domain Name Association sweep for %s: %s", region, err) return nil @@ -175,13 +175,13 @@ func sweepDomainNameAssociations(region string) error { r := ResourceDomainNameAPIAssociation() d := r.Data(nil) - id := aws.StringValue(dm.DomainName) + id := aws.ToString(dm.DomainName) d.SetId(id) sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client)) } - if aws.StringValue(output.NextToken) == "" { + if aws.ToString(output.NextToken) == "" { break } diff --git a/internal/service/appsync/tags_gen.go b/internal/service/appsync/tags_gen.go index bd6eb207346..cef3f451d5a 100644 --- a/internal/service/appsync/tags_gen.go +++ b/internal/service/appsync/tags_gen.go @@ -5,9 +5,8 @@ import ( "context" "fmt" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/aws/aws-sdk-go/service/appsync/appsynciface" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/logging" @@ -19,12 +18,12 @@ import ( // listTags lists appsync service tags. // The identifier is typically the Amazon Resource Name (ARN), although // it may also be a different identifier depending on the service. -func listTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier string) (tftags.KeyValueTags, error) { +func listTags(ctx context.Context, conn *appsync.Client, identifier string, optFns ...func(*appsync.Options)) (tftags.KeyValueTags, error) { input := &appsync.ListTagsForResourceInput{ ResourceArn: aws.String(identifier), } - output, err := conn.ListTagsForResourceWithContext(ctx, input) + output, err := conn.ListTagsForResource(ctx, input, optFns...) if err != nil { return tftags.New(ctx, nil), err @@ -36,7 +35,7 @@ func listTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier stri // ListTags lists appsync service tags and set them in Context. // It is called from outside this package. func (p *servicePackage) ListTags(ctx context.Context, meta any, identifier string) error { - tags, err := listTags(ctx, meta.(*conns.AWSClient).AppSyncConn(ctx), identifier) + tags, err := listTags(ctx, meta.(*conns.AWSClient).AppSyncClient(ctx), identifier) if err != nil { return err @@ -49,21 +48,21 @@ func (p *servicePackage) ListTags(ctx context.Context, meta any, identifier stri return nil } -// map[string]*string handling +// map[string]string handling // Tags returns appsync service tags. -func Tags(tags tftags.KeyValueTags) map[string]*string { - return aws.StringMap(tags.Map()) +func Tags(tags tftags.KeyValueTags) map[string]string { + return tags.Map() } // KeyValueTags creates tftags.KeyValueTags from appsync service tags. -func KeyValueTags(ctx context.Context, tags map[string]*string) tftags.KeyValueTags { +func KeyValueTags(ctx context.Context, tags map[string]string) tftags.KeyValueTags { return tftags.New(ctx, tags) } // getTagsIn returns appsync service tags from Context. // nil is returned if there are no input tags. -func getTagsIn(ctx context.Context) map[string]*string { +func getTagsIn(ctx context.Context) map[string]string { if inContext, ok := tftags.FromContext(ctx); ok { if tags := Tags(inContext.TagsIn.UnwrapOrDefault()); len(tags) > 0 { return tags @@ -74,7 +73,7 @@ func getTagsIn(ctx context.Context) map[string]*string { } // setTagsOut sets appsync service tags in Context. -func setTagsOut(ctx context.Context, tags map[string]*string) { +func setTagsOut(ctx context.Context, tags map[string]string) { if inContext, ok := tftags.FromContext(ctx); ok { inContext.TagsOut = option.Some(KeyValueTags(ctx, tags)) } @@ -83,7 +82,7 @@ func setTagsOut(ctx context.Context, tags map[string]*string) { // updateTags updates appsync service tags. // The identifier is typically the Amazon Resource Name (ARN), although // it may also be a different identifier depending on the service. -func updateTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier string, oldTagsMap, newTagsMap any) error { +func updateTags(ctx context.Context, conn *appsync.Client, identifier string, oldTagsMap, newTagsMap any, optFns ...func(*appsync.Options)) error { oldTags := tftags.New(ctx, oldTagsMap) newTags := tftags.New(ctx, newTagsMap) @@ -94,10 +93,10 @@ func updateTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier st if len(removedTags) > 0 { input := &appsync.UntagResourceInput{ ResourceArn: aws.String(identifier), - TagKeys: aws.StringSlice(removedTags.Keys()), + TagKeys: removedTags.Keys(), } - _, err := conn.UntagResourceWithContext(ctx, input) + _, err := conn.UntagResource(ctx, input, optFns...) if err != nil { return fmt.Errorf("untagging resource (%s): %w", identifier, err) @@ -112,7 +111,7 @@ func updateTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier st Tags: Tags(updatedTags), } - _, err := conn.TagResourceWithContext(ctx, input) + _, err := conn.TagResource(ctx, input, optFns...) if err != nil { return fmt.Errorf("tagging resource (%s): %w", identifier, err) @@ -125,5 +124,5 @@ func updateTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier st // UpdateTags updates appsync service tags. // It is called from outside this package. func (p *servicePackage) UpdateTags(ctx context.Context, meta any, identifier string, oldTags, newTags any) error { - return updateTags(ctx, meta.(*conns.AWSClient).AppSyncConn(ctx), identifier, oldTags, newTags) + return updateTags(ctx, meta.(*conns.AWSClient).AppSyncClient(ctx), identifier, oldTags, newTags) } diff --git a/internal/service/appsync/type.go b/internal/service/appsync/type.go index 84b817a3b1b..f73c3877263 100644 --- a/internal/service/appsync/type.go +++ b/internal/service/appsync/type.go @@ -9,13 +9,14 @@ import ( "log" "strings" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) @@ -50,9 +51,9 @@ func ResourceType() *schema.Resource { Required: true, }, "format": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.TypeDefinitionFormat_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.TypeDefinitionFormat](), }, "name": { Type: schema.TypeString, @@ -64,29 +65,29 @@ func ResourceType() *schema.Resource { func resourceTypeCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID := d.Get("api_id").(string) params := &appsync.CreateTypeInput{ ApiId: aws.String(apiID), Definition: aws.String(d.Get("definition").(string)), - Format: aws.String(d.Get("format").(string)), + Format: awstypes.TypeDefinitionFormat(d.Get("format").(string)), } - out, err := conn.CreateTypeWithContext(ctx, params) + out, err := conn.CreateType(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync Type: %s", err) } - d.SetId(fmt.Sprintf("%s:%s:%s", apiID, aws.StringValue(out.Type.Format), aws.StringValue(out.Type.Name))) + d.SetId(fmt.Sprintf("%s:%s:%s", apiID, string(out.Type.Format), aws.ToString(out.Type.Name))) return append(diags, resourceTypeRead(ctx, d, meta)...) } func resourceTypeRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, format, name, err := DecodeTypeID(d.Id()) if err != nil { @@ -116,16 +117,16 @@ func resourceTypeRead(ctx context.Context, d *schema.ResourceData, meta interfac func resourceTypeUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) params := &appsync.UpdateTypeInput{ ApiId: aws.String(d.Get("api_id").(string)), - Format: aws.String(d.Get("format").(string)), + Format: awstypes.TypeDefinitionFormat(d.Get("format").(string)), TypeName: aws.String(d.Get("name").(string)), Definition: aws.String(d.Get("definition").(string)), } - _, err := conn.UpdateTypeWithContext(ctx, params) + _, err := conn.UpdateType(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "updating Appsync Type %q: %s", d.Id(), err) } @@ -135,15 +136,15 @@ func resourceTypeUpdate(ctx context.Context, d *schema.ResourceData, meta interf func resourceTypeDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) input := &appsync.DeleteTypeInput{ ApiId: aws.String(d.Get("api_id").(string)), TypeName: aws.String(d.Get("name").(string)), } - _, err := conn.DeleteTypeWithContext(ctx, input) + _, err := conn.DeleteType(ctx, input) if err != nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return diags } return sdkdiag.AppendErrorf(diags, "deleting Appsync Type: %s", err) diff --git a/internal/service/appsync/type_test.go b/internal/service/appsync/type_test.go index 71e25a63b3c..ae624999acb 100644 --- a/internal/service/appsync/type_test.go +++ b/internal/service/appsync/type_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -22,12 +22,12 @@ import ( func testAccType_basic(t *testing.T) { ctx := acctest.Context(t) - var typ appsync.Type + var typ awstypes.Type resourceName := "aws_appsync_type.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckTypeDestroy(ctx), @@ -53,12 +53,12 @@ func testAccType_basic(t *testing.T) { func testAccType_disappears(t *testing.T) { ctx := acctest.Context(t) - var typ appsync.Type + var typ awstypes.Type resourceName := "aws_appsync_type.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckTypeDestroy(ctx), @@ -77,7 +77,7 @@ func testAccType_disappears(t *testing.T) { func testAccCheckTypeDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_type" { @@ -103,7 +103,7 @@ func testAccCheckTypeDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckTypeExists(ctx context.Context, resourceName string, typ *appsync.Type) resource.TestCheckFunc { +func testAccCheckTypeExists(ctx context.Context, resourceName string, typ *awstypes.Type) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] if !ok { @@ -115,7 +115,7 @@ func testAccCheckTypeExists(ctx context.Context, resourceName string, typ *appsy return err } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) out, err := tfappsync.FindTypeByThreePartKey(ctx, conn, apiID, format, name) if err != nil { return err diff --git a/internal/service/appsync/wait.go b/internal/service/appsync/wait.go index 59bd7cb9c48..1449b2c725f 100644 --- a/internal/service/appsync/wait.go +++ b/internal/service/appsync/wait.go @@ -7,8 +7,10 @@ import ( "context" "time" - "github.com/aws/aws-sdk-go/service/appsync" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/enum" ) const ( @@ -18,10 +20,10 @@ const ( domainNameAPIDisassociationTimeout = 60 * time.Minute ) -func waitAPICacheAvailable(ctx context.Context, conn *appsync.AppSync, id string) error { +func waitAPICacheAvailable(ctx context.Context, conn *appsync.Client, id string) error { stateConf := &retry.StateChangeConf{ - Pending: []string{appsync.ApiCacheStatusCreating, appsync.ApiCacheStatusModifying}, - Target: []string{appsync.ApiCacheStatusAvailable}, + Pending: enum.Slice(awstypes.ApiCacheStatusCreating, awstypes.ApiCacheStatusModifying), + Target: enum.Slice(awstypes.ApiCacheStatusAvailable), Refresh: StatusAPICache(ctx, conn, id), Timeout: apiCacheAvailableTimeout, } @@ -31,9 +33,9 @@ func waitAPICacheAvailable(ctx context.Context, conn *appsync.AppSync, id string return err } -func waitAPICacheDeleted(ctx context.Context, conn *appsync.AppSync, id string) error { +func waitAPICacheDeleted(ctx context.Context, conn *appsync.Client, id string) error { stateConf := &retry.StateChangeConf{ - Pending: []string{appsync.ApiCacheStatusDeleting}, + Pending: enum.Slice(awstypes.ApiCacheStatusDeleting), Target: []string{}, Refresh: StatusAPICache(ctx, conn, id), Timeout: apiCacheDeletedTimeout, @@ -44,10 +46,10 @@ func waitAPICacheDeleted(ctx context.Context, conn *appsync.AppSync, id string) return err } -func waitDomainNameAPIAssociation(ctx context.Context, conn *appsync.AppSync, id string) error { +func waitDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, id string) error { stateConf := &retry.StateChangeConf{ - Pending: []string{appsync.AssociationStatusProcessing}, - Target: []string{appsync.AssociationStatusSuccess}, + Pending: enum.Slice(awstypes.AssociationStatusProcessing), + Target: enum.Slice(awstypes.AssociationStatusSuccess), Refresh: statusDomainNameAPIAssociation(ctx, conn, id), Timeout: domainNameAPIAssociationTimeout, } @@ -57,9 +59,9 @@ func waitDomainNameAPIAssociation(ctx context.Context, conn *appsync.AppSync, id return err } -func waitDomainNameAPIDisassociation(ctx context.Context, conn *appsync.AppSync, id string) error { +func waitDomainNameAPIDisassociation(ctx context.Context, conn *appsync.Client, id string) error { stateConf := &retry.StateChangeConf{ - Pending: []string{appsync.AssociationStatusProcessing}, + Pending: enum.Slice(awstypes.AssociationStatusProcessing), Target: []string{}, Refresh: statusDomainNameAPIAssociation(ctx, conn, id), Timeout: domainNameAPIDisassociationTimeout, diff --git a/names/data/names_data.csv b/names/data/names_data.csv index 2fb03065013..48dc2fc2ce2 100644 --- a/names/data/names_data.csv +++ b/names/data/names_data.csv @@ -25,7 +25,7 @@ applicationcostprofiler,applicationcostprofiler,applicationcostprofiler,applicat discovery,discovery,applicationdiscoveryservice,applicationdiscoveryservice,,discovery,,applicationdiscovery;applicationdiscoveryservice,Discovery,ApplicationDiscoveryService,,1,,,aws_discovery_,,discovery_,Application Discovery,AWS,,x,,,,,Application Discovery Service,,, mgn,mgn,mgn,mgn,,mgn,,,Mgn,Mgn,,1,,,aws_mgn_,,mgn_,Application Migration (Mgn),AWS,,x,,,,,mgn,,, appstream,appstream,appstream,appstream,,appstream,,,AppStream,AppStream,,1,,,aws_appstream_,,appstream_,AppStream 2.0,Amazon,,,,,,,AppStream,ListAssociatedFleets,, -appsync,appsync,appsync,appsync,,appsync,,,AppSync,AppSync,,1,,,aws_appsync_,,appsync_,AppSync,AWS,,,,,,,AppSync,ListDomainNames,, +appsync,appsync,appsync,appsync,,appsync,,,AppSync,AppSync,,,2,,aws_appsync_,,appsync_,AppSync,AWS,,,,,,,AppSync,ListDomainNames,, ,,,,,,,,,,,,,,,,,Artifact,AWS,x,,,,,,,,,No SDK support athena,athena,athena,athena,,athena,,,Athena,Athena,,,2,,aws_athena_,,athena_,Athena,Amazon,,,,,,,Athena,ListDataCatalogs,, auditmanager,auditmanager,auditmanager,auditmanager,,auditmanager,,,AuditManager,AuditManager,,,2,,aws_auditmanager_,,auditmanager_,Audit Manager,AWS,,,,,,,AuditManager,GetAccountStatus,, diff --git a/names/names.go b/names/names.go index 4b67e7c95b2..2a0e9c54866 100644 --- a/names/names.go +++ b/names/names.go @@ -27,6 +27,7 @@ import ( const ( AccessAnalyzerEndpointID = "access-analyzer" AMPEndpointID = "aps" + AppSyncEndpointID = "appsync" AthenaEndpointID = "athena" AuditManagerEndpointID = "auditmanager" BatchEndpointID = "batch" From 56d274362ee47b103b05fac0a6a601d7952f672c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 19 Jun 2024 10:34:15 -0400 Subject: [PATCH 002/208] Revert "appsync: Migrate to AWS SDK v2" This reverts commit 9c276d1d63dfa746cd7adf2f182f46796ae4508f. --- go.mod | 1 - go.sum | 2 - internal/conns/awsclient_gen.go | 6 +- internal/service/appsync/api_cache.go | 53 +++-- internal/service/appsync/api_cache_test.go | 16 +- internal/service/appsync/api_key.go | 40 ++-- internal/service/appsync/api_key_test.go | 32 +-- internal/service/appsync/datasource.go | 190 ++++++++-------- internal/service/appsync/datasource_test.go | 41 ++-- internal/service/appsync/domain_name.go | 27 ++- .../appsync/domain_name_api_association.go | 25 +-- .../domain_name_api_association_test.go | 24 +- internal/service/appsync/domain_name_test.go | 28 +-- internal/service/appsync/find.go | 33 ++- internal/service/appsync/function.go | 86 ++++--- internal/service/appsync/function_test.go | 43 ++-- internal/service/appsync/generate.go | 2 +- internal/service/appsync/graphql_api.go | 212 +++++++++--------- internal/service/appsync/graphql_api_test.go | 148 ++++++------ internal/service/appsync/resolver.go | 104 +++++---- internal/service/appsync/resolver_test.go | 65 +++--- .../appsync/service_endpoints_gen_test.go | 40 ++-- internal/service/appsync/service_package.go | 26 +++ .../service/appsync/service_package_gen.go | 17 +- internal/service/appsync/status.go | 11 +- internal/service/appsync/sweep.go | 28 +-- internal/service/appsync/tags_gen.go | 33 +-- internal/service/appsync/type.go | 37 ++- internal/service/appsync/type_test.go | 16 +- internal/service/appsync/wait.go | 24 +- names/data/names_data.csv | 2 +- names/names.go | 1 - 32 files changed, 710 insertions(+), 703 deletions(-) create mode 100644 internal/service/appsync/service_package.go diff --git a/go.mod b/go.mod index 6b1c45f4fa8..f7bc9468f01 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/appfabric v1.7.3 github.com/aws/aws-sdk-go-v2/service/appflow v1.41.3 github.com/aws/aws-sdk-go-v2/service/apprunner v1.28.3 - github.com/aws/aws-sdk-go-v2/service/appsync v1.31.3 github.com/aws/aws-sdk-go-v2/service/athena v1.40.3 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.32.3 github.com/aws/aws-sdk-go-v2/service/batch v1.35.1 diff --git a/go.sum b/go.sum index d85201a9ffb..647f06eb395 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,6 @@ github.com/aws/aws-sdk-go-v2/service/appflow v1.41.3 h1:tK9duUSGFRz/8nshXYyddbw2 github.com/aws/aws-sdk-go-v2/service/appflow v1.41.3/go.mod h1:D08dEVi5M9I0qAIl1IyMydjFQPcjQqCp2Mw3WqhCDbQ= github.com/aws/aws-sdk-go-v2/service/apprunner v1.28.3 h1:nby4wV20qfVF2yswXCFKL7lTkddNvYUj2P9+k/UbYQc= github.com/aws/aws-sdk-go-v2/service/apprunner v1.28.3/go.mod h1:ECUaiPa9O5LwqgVNeBduNwayctvWkc5nb8NdBLmLJ00= -github.com/aws/aws-sdk-go-v2/service/appsync v1.31.3 h1:P6IEs0+zLDoYP2vzLoPccaQRn1MnjkXwE6t0NlPeUQc= -github.com/aws/aws-sdk-go-v2/service/appsync v1.31.3/go.mod h1:vBD0NGVgRoouqxDtybMYcBPeFE9yCbfleWZyw95qkWk= github.com/aws/aws-sdk-go-v2/service/athena v1.40.3 h1:Q54tyTwpoEyJNmP4WqwT9hdPHpbpNahvcW9so6lItQw= github.com/aws/aws-sdk-go-v2/service/athena v1.40.3/go.mod h1:HP/WmaAcHBNMHa6EwxTMPdqCIbV0uCnWR8WNTp2AG5c= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.32.3 h1:Y9Tqv+Pb93GGLpxYoKYdz9ZdwpnT5HP6AFazR3moNlM= diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go index 35e02a6ac0e..49b10f47f61 100644 --- a/internal/conns/awsclient_gen.go +++ b/internal/conns/awsclient_gen.go @@ -12,7 +12,6 @@ import ( appfabric_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appfabric" appflow_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appflow" apprunner_sdkv2 "github.com/aws/aws-sdk-go-v2/service/apprunner" - appsync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appsync" athena_sdkv2 "github.com/aws/aws-sdk-go-v2/service/athena" auditmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/auditmanager" batch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/batch" @@ -156,6 +155,7 @@ import ( applicationinsights_sdkv1 "github.com/aws/aws-sdk-go/service/applicationinsights" appmesh_sdkv1 "github.com/aws/aws-sdk-go/service/appmesh" appstream_sdkv1 "github.com/aws/aws-sdk-go/service/appstream" + appsync_sdkv1 "github.com/aws/aws-sdk-go/service/appsync" autoscaling_sdkv1 "github.com/aws/aws-sdk-go/service/autoscaling" autoscalingplans_sdkv1 "github.com/aws/aws-sdk-go/service/autoscalingplans" backup_sdkv1 "github.com/aws/aws-sdk-go/service/backup" @@ -321,8 +321,8 @@ func (c *AWSClient) AppStreamConn(ctx context.Context) *appstream_sdkv1.AppStrea return errs.Must(conn[*appstream_sdkv1.AppStream](ctx, c, names.AppStream, make(map[string]any))) } -func (c *AWSClient) AppSyncClient(ctx context.Context) *appsync_sdkv2.Client { - return errs.Must(client[*appsync_sdkv2.Client](ctx, c, names.AppSync, make(map[string]any))) +func (c *AWSClient) AppSyncConn(ctx context.Context) *appsync_sdkv1.AppSync { + return errs.Must(conn[*appsync_sdkv1.AppSync](ctx, c, names.AppSync, make(map[string]any))) } func (c *AWSClient) ApplicationInsightsConn(ctx context.Context) *applicationinsights_sdkv1.ApplicationInsights { diff --git a/internal/service/appsync/api_cache.go b/internal/service/appsync/api_cache.go index 967f96f2a37..f7b4c5d6db4 100644 --- a/internal/service/appsync/api_cache.go +++ b/internal/service/appsync/api_cache.go @@ -7,14 +7,13 @@ import ( "context" "log" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/enum" - "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) @@ -36,14 +35,14 @@ func ResourceAPICache() *schema.Resource { Required: true, }, "api_caching_behavior": { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.ApiCachingBehavior](), + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice(appsync.ApiCachingBehavior_Values(), false), }, "type": { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.ApiCacheType](), + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice(appsync.ApiCacheType_Values(), false), }, "ttl": { Type: schema.TypeInt, @@ -65,26 +64,26 @@ func ResourceAPICache() *schema.Resource { func resourceAPICacheCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID := d.Get("api_id").(string) params := &appsync.CreateApiCacheInput{ ApiId: aws.String(apiID), - Type: awstypes.ApiCacheType(d.Get("type").(string)), - ApiCachingBehavior: awstypes.ApiCachingBehavior(d.Get("api_caching_behavior").(string)), - Ttl: int64(d.Get("ttl").(int)), + Type: aws.String(d.Get("type").(string)), + ApiCachingBehavior: aws.String(d.Get("api_caching_behavior").(string)), + Ttl: aws.Int64(int64(d.Get("ttl").(int))), } if v, ok := d.GetOk("at_rest_encryption_enabled"); ok { - params.AtRestEncryptionEnabled = v.(bool) + params.AtRestEncryptionEnabled = aws.Bool(v.(bool)) } if v, ok := d.GetOk("transit_encryption_enabled"); ok { - params.TransitEncryptionEnabled = v.(bool) + params.TransitEncryptionEnabled = aws.Bool(v.(bool)) } - _, err := conn.CreateApiCache(ctx, params) + _, err := conn.CreateApiCacheWithContext(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync API Cache: %s", err) } @@ -100,7 +99,7 @@ func resourceAPICacheCreate(ctx context.Context, d *schema.ResourceData, meta in func resourceAPICacheRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) cache, err := FindAPICacheByID(ctx, conn, d.Id()) if !d.IsNewResource() && tfresource.NotFound(err) { @@ -125,25 +124,25 @@ func resourceAPICacheRead(ctx context.Context, d *schema.ResourceData, meta inte func resourceAPICacheUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) params := &appsync.UpdateApiCacheInput{ ApiId: aws.String(d.Id()), } if d.HasChange("type") { - params.Type = awstypes.ApiCacheType(d.Get("type").(string)) + params.Type = aws.String(d.Get("type").(string)) } if d.HasChange("api_caching_behavior") { - params.ApiCachingBehavior = awstypes.ApiCachingBehavior(d.Get("api_caching_behavior").(string)) + params.ApiCachingBehavior = aws.String(d.Get("api_caching_behavior").(string)) } if d.HasChange("ttl") { - params.Ttl = int64(d.Get("ttl").(int)) + params.Ttl = aws.Int64(int64(d.Get("ttl").(int))) } - _, err := conn.UpdateApiCache(ctx, params) + _, err := conn.UpdateApiCacheWithContext(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "updating Appsync API Cache %q: %s", d.Id(), err) } @@ -157,14 +156,14 @@ func resourceAPICacheUpdate(ctx context.Context, d *schema.ResourceData, meta in func resourceAPICacheDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) input := &appsync.DeleteApiCacheInput{ ApiId: aws.String(d.Id()), } - _, err := conn.DeleteApiCache(ctx, input) + _, err := conn.DeleteApiCacheWithContext(ctx, input) if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return diags } return sdkdiag.AppendErrorf(diags, "deleting Appsync API Cache: %s", err) diff --git a/internal/service/appsync/api_cache_test.go b/internal/service/appsync/api_cache_test.go index 91e08552c48..73f805a7649 100644 --- a/internal/service/appsync/api_cache_test.go +++ b/internal/service/appsync/api_cache_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/service/appsync" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -21,12 +21,12 @@ import ( func testAccAPICache_basic(t *testing.T) { ctx := acctest.Context(t) - var apiCache awstypes.ApiCache + var apiCache appsync.ApiCache resourceName := "aws_appsync_api_cache.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPICacheDestroy(ctx), @@ -51,12 +51,12 @@ func testAccAPICache_basic(t *testing.T) { func testAccAPICache_disappears(t *testing.T) { ctx := acctest.Context(t) - var apiCache awstypes.ApiCache + var apiCache appsync.ApiCache resourceName := "aws_appsync_api_cache.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPICacheDestroy(ctx), @@ -75,7 +75,7 @@ func testAccAPICache_disappears(t *testing.T) { func testAccCheckAPICacheDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_api_cache" { continue @@ -95,14 +95,14 @@ func testAccCheckAPICacheDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckAPICacheExists(ctx context.Context, resourceName string, apiCache *awstypes.ApiCache) resource.TestCheckFunc { +func testAccCheckAPICacheExists(ctx context.Context, resourceName string, apiCache *appsync.ApiCache) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Appsync Api Cache Not found in state: %s", resourceName) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) cache, err := tfappsync.FindAPICacheByID(ctx, conn, rs.Primary.ID) if err != nil { return err diff --git a/internal/service/appsync/api_key.go b/internal/service/appsync/api_key.go index ba19ea2cc87..154306cde7f 100644 --- a/internal/service/appsync/api_key.go +++ b/internal/service/appsync/api_key.go @@ -10,16 +10,14 @@ import ( "strings" "time" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" - tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" ) // @SDKResource("aws_appsync_api_key") @@ -66,7 +64,7 @@ func ResourceAPIKey() *schema.Resource { func resourceAPIKeyCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID := d.Get("api_id").(string) @@ -76,20 +74,20 @@ func resourceAPIKeyCreate(ctx context.Context, d *schema.ResourceData, meta inte } if v, ok := d.GetOk("expires"); ok { t, _ := time.Parse(time.RFC3339, v.(string)) - params.Expires = t.Unix() + params.Expires = aws.Int64(t.Unix()) } - resp, err := conn.CreateApiKey(ctx, params) + resp, err := conn.CreateApiKeyWithContext(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync API Key: %s", err) } - d.SetId(fmt.Sprintf("%s:%s", apiID, aws.ToString(resp.ApiKey.Id))) + d.SetId(fmt.Sprintf("%s:%s", apiID, aws.StringValue(resp.ApiKey.Id))) return append(diags, resourceAPIKeyRead(ctx, d, meta)...) } func resourceAPIKeyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID, keyID, err := DecodeAPIKeyID(d.Id()) if err != nil { @@ -109,13 +107,13 @@ func resourceAPIKeyRead(ctx context.Context, d *schema.ResourceData, meta interf d.Set("api_id", apiID) d.Set("key", key.Id) d.Set("description", key.Description) - d.Set("expires", time.Unix(key.Expires, 0).UTC().Format(time.RFC3339)) + d.Set("expires", time.Unix(aws.Int64Value(key.Expires), 0).UTC().Format(time.RFC3339)) return diags } func resourceAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID, keyID, err := DecodeAPIKeyID(d.Id()) if err != nil { @@ -131,10 +129,10 @@ func resourceAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, meta inte } if d.HasChange("expires") { t, _ := time.Parse(time.RFC3339, d.Get("expires").(string)) - params.Expires = t.Unix() + params.Expires = aws.Int64(t.Unix()) } - _, err = conn.UpdateApiKey(ctx, params) + _, err = conn.UpdateApiKeyWithContext(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "updating Appsync API Key (%s): %s", d.Id(), err) } @@ -144,7 +142,7 @@ func resourceAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, meta inte func resourceAPIKeyDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID, keyID, err := DecodeAPIKeyID(d.Id()) if err != nil { @@ -155,9 +153,9 @@ func resourceAPIKeyDelete(ctx context.Context, d *schema.ResourceData, meta inte ApiId: aws.String(apiID), Id: aws.String(keyID), } - _, err = conn.DeleteApiKey(ctx, input) + _, err = conn.DeleteApiKeyWithContext(ctx, input) if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return diags } return sdkdiag.AppendErrorf(diags, "deleting Appsync API Key (%s): %s", d.Id(), err) @@ -174,17 +172,17 @@ func DecodeAPIKeyID(id string) (string, string, error) { return parts[0], parts[1], nil } -func GetAPIKey(ctx context.Context, apiID, keyID string, conn *appsync.Client) (*awstypes.ApiKey, error) { +func GetAPIKey(ctx context.Context, apiID, keyID string, conn *appsync.AppSync) (*appsync.ApiKey, error) { input := &appsync.ListApiKeysInput{ ApiId: aws.String(apiID), } for { - resp, err := conn.ListApiKeys(ctx, input) + resp, err := conn.ListApiKeysWithContext(ctx, input) if err != nil { return nil, err } - for _, apiKey := range tfslices.ToPointers(resp.ApiKeys) { - if aws.ToString(apiKey.Id) == keyID { + for _, apiKey := range resp.ApiKeys { + if aws.StringValue(apiKey.Id) == keyID { return apiKey, nil } } diff --git a/internal/service/appsync/api_key_test.go b/internal/service/appsync/api_key_test.go index 93f3e33e048..b9cdc5deb73 100644 --- a/internal/service/appsync/api_key_test.go +++ b/internal/service/appsync/api_key_test.go @@ -10,27 +10,27 @@ import ( "time" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go-v2/aws" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/errs" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" "github.com/hashicorp/terraform-provider-aws/names" ) func testAccAPIKey_basic(t *testing.T) { ctx := acctest.Context(t) - var apiKey awstypes.ApiKey + var apiKey appsync.ApiKey dateAfterSevenDays := time.Now().UTC().Add(time.Hour * 24 * time.Duration(7)).Truncate(time.Hour) resourceName := "aws_appsync_api_key.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPIKeyDestroy(ctx), @@ -55,12 +55,12 @@ func testAccAPIKey_basic(t *testing.T) { func testAccAPIKey_description(t *testing.T) { ctx := acctest.Context(t) - var apiKey awstypes.ApiKey + var apiKey appsync.ApiKey resourceName := "aws_appsync_api_key.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPIKeyDestroy(ctx), @@ -90,14 +90,14 @@ func testAccAPIKey_description(t *testing.T) { func testAccAPIKey_expires(t *testing.T) { ctx := acctest.Context(t) - var apiKey awstypes.ApiKey + var apiKey appsync.ApiKey dateAfterTenDays := time.Now().UTC().Add(time.Hour * 24 * time.Duration(10)).Truncate(time.Hour) dateAfterTwentyDays := time.Now().UTC().Add(time.Hour * 24 * time.Duration(20)).Truncate(time.Hour) resourceName := "aws_appsync_api_key.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPIKeyDestroy(ctx), @@ -127,7 +127,7 @@ func testAccAPIKey_expires(t *testing.T) { func testAccCheckAPIKeyDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_api_key" { continue @@ -140,13 +140,13 @@ func testAccCheckAPIKeyDestroy(ctx context.Context) resource.TestCheckFunc { apiKey, err := tfappsync.GetAPIKey(ctx, apiID, keyID, conn) if err == nil { - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return nil } return err } - if apiKey != nil && aws.ToString(apiKey.Id) == keyID { + if apiKey != nil && aws.StringValue(apiKey.Id) == keyID { return fmt.Errorf("Appsync API Key ID %q still exists", rs.Primary.ID) } @@ -156,7 +156,7 @@ func testAccCheckAPIKeyDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckAPIKeyExists(ctx context.Context, resourceName string, apiKey *awstypes.ApiKey) resource.TestCheckFunc { +func testAccCheckAPIKeyExists(ctx context.Context, resourceName string, apiKey *appsync.ApiKey) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] if !ok { @@ -168,7 +168,7 @@ func testAccCheckAPIKeyExists(ctx context.Context, resourceName string, apiKey * return err } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) key, err := tfappsync.GetAPIKey(ctx, apiID, keyID, conn) if err != nil { return err @@ -184,9 +184,9 @@ func testAccCheckAPIKeyExists(ctx context.Context, resourceName string, apiKey * } } -func testAccCheckAPIKeyExpiresDate(apiKey *awstypes.ApiKey, expectedTime time.Time) resource.TestCheckFunc { +func testAccCheckAPIKeyExpiresDate(apiKey *appsync.ApiKey, expectedTime time.Time) resource.TestCheckFunc { return func(s *terraform.State) error { - apiKeyExpiresTime := time.Unix(apiKey.Expires, 0) + apiKeyExpiresTime := time.Unix(aws.Int64Value(apiKey.Expires), 0) if !apiKeyExpiresTime.Equal(expectedTime) { return fmt.Errorf("Appsync API Key expires difference: got %s and expected %s", apiKeyExpiresTime.Format(time.RFC3339), expectedTime.Format(time.RFC3339)) } diff --git a/internal/service/appsync/datasource.go b/internal/service/appsync/datasource.go index d9363b3b207..f12dc6f28d5 100644 --- a/internal/service/appsync/datasource.go +++ b/internal/service/appsync/datasource.go @@ -10,16 +10,14 @@ import ( "strings" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/enum" - "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" @@ -145,10 +143,10 @@ func ResourceDataSource() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "authorization_type": { - Type: schema.TypeString, - Optional: true, - Default: string(awstypes.AuthorizationTypeAwsIam), - ValidateDiagFunc: enum.Validate[awstypes.AuthorizationType](), + Type: schema.TypeString, + Optional: true, + Default: appsync.AuthorizationTypeAwsIam, + ValidateFunc: validation.StringInSlice(appsync.AuthorizationType_Values(), true), }, "aws_iam_config": { Type: schema.TypeList, @@ -255,10 +253,10 @@ func ResourceDataSource() *schema.Resource { }, }, "source_type": { - Type: schema.TypeString, - Optional: true, - Default: string(awstypes.RelationalDatabaseSourceTypeRdsHttpEndpoint), - ValidateDiagFunc: enum.Validate[awstypes.RelationalDatabaseSourceType](), + Type: schema.TypeString, + Optional: true, + Default: appsync.RelationalDatabaseSourceTypeRdsHttpEndpoint, + ValidateFunc: validation.StringInSlice(appsync.RelationalDatabaseSourceType_Values(), true), }, }, }, @@ -270,9 +268,9 @@ func ResourceDataSource() *schema.Resource { ValidateFunc: verify.ValidARN, }, "type": { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.DataSourceType](), + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice(appsync.DataSourceType_Values(), true), StateFunc: func(v interface{}) string { return strings.ToUpper(v.(string)) }, @@ -283,14 +281,14 @@ func ResourceDataSource() *schema.Resource { func resourceDataSourceCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) region := meta.(*conns.AWSClient).Region name := d.Get("name").(string) input := &appsync.CreateDataSourceInput{ ApiId: aws.String(d.Get("api_id").(string)), Name: aws.String(name), - Type: awstypes.DataSourceType(d.Get("type").(string)), + Type: aws.String(d.Get("type").(string)), } if v, ok := d.GetOk("description"); ok { @@ -329,7 +327,7 @@ func resourceDataSourceCreate(ctx context.Context, d *schema.ResourceData, meta input.ServiceRoleArn = aws.String(v.(string)) } - _, err := conn.CreateDataSource(ctx, input) + _, err := conn.CreateDataSourceWithContext(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync Data Source (%s): %s", name, err) @@ -342,7 +340,7 @@ func resourceDataSourceCreate(ctx context.Context, d *schema.ResourceData, meta func resourceDataSourceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID, name, err := DecodeID(d.Id()) @@ -395,7 +393,7 @@ func resourceDataSourceRead(ctx context.Context, d *schema.ResourceData, meta in func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) region := meta.(*conns.AWSClient).Region apiID, name, err := DecodeID(d.Id()) @@ -407,7 +405,7 @@ func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta input := &appsync.UpdateDataSourceInput{ ApiId: aws.String(apiID), Name: aws.String(name), - Type: awstypes.DataSourceType(d.Get("type").(string)), + Type: aws.String(d.Get("type").(string)), } if v, ok := d.GetOk("description"); ok { @@ -442,7 +440,7 @@ func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta input.ServiceRoleArn = aws.String(v.(string)) } - _, err = conn.UpdateDataSource(ctx, input) + _, err = conn.UpdateDataSourceWithContext(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "updating Appsync Data Source (%s): %s", d.Id(), err) @@ -453,7 +451,7 @@ func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta func resourceDataSourceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID, name, err := DecodeID(d.Id()) @@ -466,9 +464,9 @@ func resourceDataSourceDelete(ctx context.Context, d *schema.ResourceData, meta Name: aws.String(name), } - _, err = conn.DeleteDataSource(ctx, input) + _, err = conn.DeleteDataSourceWithContext(ctx, input) - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return diags } @@ -479,15 +477,15 @@ func resourceDataSourceDelete(ctx context.Context, d *schema.ResourceData, meta return diags } -func FindDataSourceByTwoPartKey(ctx context.Context, conn *appsync.Client, apiID, name string) (*awstypes.DataSource, error) { +func FindDataSourceByTwoPartKey(ctx context.Context, conn *appsync.AppSync, apiID, name string) (*appsync.DataSource, error) { input := &appsync.GetDataSourceInput{ ApiId: aws.String(apiID), Name: aws.String(name), } - output, err := conn.GetDataSource(ctx, input) + output, err := conn.GetDataSourceWithContext(ctx, input) - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -513,14 +511,14 @@ func DecodeID(id string) (string, string, error) { return idParts[0], idParts[1], nil } -func expandDynamoDBDataSourceConfig(l []interface{}, currentRegion string) *awstypes.DynamodbDataSourceConfig { +func expandDynamoDBDataSourceConfig(l []interface{}, currentRegion string) *appsync.DynamodbDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.DynamodbDataSourceConfig{ + result := &appsync.DynamodbDataSourceConfig{ AwsRegion: aws.String(currentRegion), TableName: aws.String(configured["table_name"].(string)), } @@ -530,11 +528,11 @@ func expandDynamoDBDataSourceConfig(l []interface{}, currentRegion string) *awst } if v, ok := configured["use_caller_credentials"]; ok { - result.UseCallerCredentials = v.(bool) + result.UseCallerCredentials = aws.Bool(v.(bool)) } if v, ok := configured["versioned"]; ok { - result.Versioned = v.(bool) + result.Versioned = aws.Bool(v.(bool)) } if v, ok := configured["delta_sync_config"].([]interface{}); ok && len(v) > 0 { @@ -544,21 +542,21 @@ func expandDynamoDBDataSourceConfig(l []interface{}, currentRegion string) *awst return result } -func expandDynamoDBDataSourceDeltaSyncConfig(l []interface{}) *awstypes.DeltaSyncConfig { +func expandDynamoDBDataSourceDeltaSyncConfig(l []interface{}) *appsync.DeltaSyncConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.DeltaSyncConfig{} + result := &appsync.DeltaSyncConfig{} if v, ok := configured["base_table_ttl"].(int); ok { - result.BaseTableTTL = int64(v) + result.BaseTableTTL = aws.Int64(int64(v)) } if v, ok := configured["delta_sync_table_ttl"].(int); ok { - result.DeltaSyncTableTTL = int64(v) + result.DeltaSyncTableTTL = aws.Int64(int64(v)) } if v, ok := configured["delta_sync_table_name"].(string); ok { @@ -568,18 +566,23 @@ func expandDynamoDBDataSourceDeltaSyncConfig(l []interface{}) *awstypes.DeltaSyn return result } -func flattenDynamoDBDataSourceConfig(config *awstypes.DynamodbDataSourceConfig) []map[string]interface{} { +func flattenDynamoDBDataSourceConfig(config *appsync.DynamodbDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "region": aws.ToString(config.AwsRegion), - "table_name": aws.ToString(config.TableName), + "region": aws.StringValue(config.AwsRegion), + "table_name": aws.StringValue(config.TableName), + } + + if config.UseCallerCredentials != nil { + result["use_caller_credentials"] = aws.BoolValue(config.UseCallerCredentials) } - result["use_caller_credentials"] = config.UseCallerCredentials - result["versioned"] = config.Versioned + if config.Versioned != nil { + result["versioned"] = aws.BoolValue(config.Versioned) + } if config.DeltaSyncConfig != nil { result["delta_sync_config"] = flattenDynamoDBDataSourceDeltaSyncConfig(config.DeltaSyncConfig) @@ -588,7 +591,7 @@ func flattenDynamoDBDataSourceConfig(config *awstypes.DynamodbDataSourceConfig) return []map[string]interface{}{result} } -func flattenDynamoDBDataSourceDeltaSyncConfig(config *awstypes.DeltaSyncConfig) []map[string]interface{} { +func flattenDynamoDBDataSourceDeltaSyncConfig(config *appsync.DeltaSyncConfig) []map[string]interface{} { if config == nil { return nil } @@ -596,23 +599,28 @@ func flattenDynamoDBDataSourceDeltaSyncConfig(config *awstypes.DeltaSyncConfig) result := map[string]interface{}{} if config.DeltaSyncTableName != nil { - result["delta_sync_table_name"] = aws.ToString(config.DeltaSyncTableName) + result["delta_sync_table_name"] = aws.StringValue(config.DeltaSyncTableName) } - result["base_table_ttl"] = config.BaseTableTTL - result["delta_sync_table_ttl"] = config.DeltaSyncTableTTL + if config.BaseTableTTL != nil { + result["base_table_ttl"] = aws.Int64Value(config.BaseTableTTL) + } + + if config.DeltaSyncTableTTL != nil { + result["delta_sync_table_ttl"] = aws.Int64Value(config.DeltaSyncTableTTL) + } return []map[string]interface{}{result} } -func expandElasticsearchDataSourceConfig(l []interface{}, currentRegion string) *awstypes.ElasticsearchDataSourceConfig { +func expandElasticsearchDataSourceConfig(l []interface{}, currentRegion string) *appsync.ElasticsearchDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.ElasticsearchDataSourceConfig{ + result := &appsync.ElasticsearchDataSourceConfig{ AwsRegion: aws.String(currentRegion), Endpoint: aws.String(configured["endpoint"].(string)), } @@ -624,14 +632,14 @@ func expandElasticsearchDataSourceConfig(l []interface{}, currentRegion string) return result } -func expandOpenSearchServiceDataSourceConfig(l []interface{}, currentRegion string) *awstypes.OpenSearchServiceDataSourceConfig { +func expandOpenSearchServiceDataSourceConfig(l []interface{}, currentRegion string) *appsync.OpenSearchServiceDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.OpenSearchServiceDataSourceConfig{ + result := &appsync.OpenSearchServiceDataSourceConfig{ AwsRegion: aws.String(currentRegion), Endpoint: aws.String(configured["endpoint"].(string)), } @@ -643,40 +651,40 @@ func expandOpenSearchServiceDataSourceConfig(l []interface{}, currentRegion stri return result } -func flattenElasticsearchDataSourceConfig(config *awstypes.ElasticsearchDataSourceConfig) []map[string]interface{} { +func flattenElasticsearchDataSourceConfig(config *appsync.ElasticsearchDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "endpoint": aws.ToString(config.Endpoint), - "region": aws.ToString(config.AwsRegion), + "endpoint": aws.StringValue(config.Endpoint), + "region": aws.StringValue(config.AwsRegion), } return []map[string]interface{}{result} } -func flattenOpenSearchServiceDataSourceConfig(config *awstypes.OpenSearchServiceDataSourceConfig) []map[string]interface{} { +func flattenOpenSearchServiceDataSourceConfig(config *appsync.OpenSearchServiceDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "endpoint": aws.ToString(config.Endpoint), - "region": aws.ToString(config.AwsRegion), + "endpoint": aws.StringValue(config.Endpoint), + "region": aws.StringValue(config.AwsRegion), } return []map[string]interface{}{result} } -func expandHTTPDataSourceConfig(l []interface{}) *awstypes.HttpDataSourceConfig { +func expandHTTPDataSourceConfig(l []interface{}) *appsync.HttpDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.HttpDataSourceConfig{ + result := &appsync.HttpDataSourceConfig{ Endpoint: aws.String(configured["endpoint"].(string)), } @@ -687,13 +695,13 @@ func expandHTTPDataSourceConfig(l []interface{}) *awstypes.HttpDataSourceConfig return result } -func flattenHTTPDataSourceConfig(config *awstypes.HttpDataSourceConfig) []map[string]interface{} { +func flattenHTTPDataSourceConfig(config *appsync.HttpDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "endpoint": aws.ToString(config.Endpoint), + "endpoint": aws.StringValue(config.Endpoint), } if config.AuthorizationConfig != nil { @@ -703,15 +711,15 @@ func flattenHTTPDataSourceConfig(config *awstypes.HttpDataSourceConfig) []map[st return []map[string]interface{}{result} } -func expandHTTPDataSourceAuthorizationConfig(l []interface{}) *awstypes.AuthorizationConfig { +func expandHTTPDataSourceAuthorizationConfig(l []interface{}) *appsync.AuthorizationConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.AuthorizationConfig{ - AuthorizationType: awstypes.AuthorizationType(configured["authorization_type"].(string)), + result := &appsync.AuthorizationConfig{ + AuthorizationType: aws.String(configured["authorization_type"].(string)), } if v, ok := configured["aws_iam_config"].([]interface{}); ok && len(v) > 0 { @@ -721,13 +729,13 @@ func expandHTTPDataSourceAuthorizationConfig(l []interface{}) *awstypes.Authoriz return result } -func flattenHTTPDataSourceAuthorizationConfig(config *awstypes.AuthorizationConfig) []map[string]interface{} { +func flattenHTTPDataSourceAuthorizationConfig(config *appsync.AuthorizationConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "authorization_type": string(config.AuthorizationType), + "authorization_type": aws.StringValue(config.AuthorizationType), } if config.AwsIamConfig != nil { @@ -737,14 +745,14 @@ func flattenHTTPDataSourceAuthorizationConfig(config *awstypes.AuthorizationConf return []map[string]interface{}{result} } -func expandHTTPDataSourceIAMConfig(l []interface{}) *awstypes.AwsIamConfig { +func expandHTTPDataSourceIAMConfig(l []interface{}) *appsync.AwsIamConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.AwsIamConfig{} + result := &appsync.AwsIamConfig{} if v, ok := configured["signing_region"].(string); ok && v != "" { result.SigningRegion = aws.String(v) @@ -757,107 +765,107 @@ func expandHTTPDataSourceIAMConfig(l []interface{}) *awstypes.AwsIamConfig { return result } -func flattenHTTPDataSourceIAMConfig(config *awstypes.AwsIamConfig) []map[string]interface{} { +func flattenHTTPDataSourceIAMConfig(config *appsync.AwsIamConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "signing_region": aws.ToString(config.SigningRegion), - "signing_service_name": aws.ToString(config.SigningServiceName), + "signing_region": aws.StringValue(config.SigningRegion), + "signing_service_name": aws.StringValue(config.SigningServiceName), } return []map[string]interface{}{result} } -func expandLambdaDataSourceConfig(l []interface{}) *awstypes.LambdaDataSourceConfig { +func expandLambdaDataSourceConfig(l []interface{}) *appsync.LambdaDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.LambdaDataSourceConfig{ + result := &appsync.LambdaDataSourceConfig{ LambdaFunctionArn: aws.String(configured["function_arn"].(string)), } return result } -func flattenLambdaDataSourceConfig(config *awstypes.LambdaDataSourceConfig) []map[string]interface{} { +func flattenLambdaDataSourceConfig(config *appsync.LambdaDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "function_arn": aws.ToString(config.LambdaFunctionArn), + "function_arn": aws.StringValue(config.LambdaFunctionArn), } return []map[string]interface{}{result} } -func expandRelationalDatabaseDataSourceConfig(l []interface{}, currentRegion string) *awstypes.RelationalDatabaseDataSourceConfig { +func expandRelationalDatabaseDataSourceConfig(l []interface{}, currentRegion string) *appsync.RelationalDatabaseDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.RelationalDatabaseDataSourceConfig{ - RelationalDatabaseSourceType: awstypes.RelationalDatabaseSourceType(configured["source_type"].(string)), + result := &appsync.RelationalDatabaseDataSourceConfig{ + RelationalDatabaseSourceType: aws.String(configured["source_type"].(string)), RdsHttpEndpointConfig: testAccDataSourceConfig_expandRDSHTTPEndpoint(configured["http_endpoint_config"].([]interface{}), currentRegion), } return result } -func flattenRelationalDatabaseDataSourceConfig(config *awstypes.RelationalDatabaseDataSourceConfig) []map[string]interface{} { +func flattenRelationalDatabaseDataSourceConfig(config *appsync.RelationalDatabaseDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "source_type": string(config.RelationalDatabaseSourceType), + "source_type": aws.StringValue(config.RelationalDatabaseSourceType), "http_endpoint_config": flattenRDSHTTPEndpointConfig(config.RdsHttpEndpointConfig), } return []map[string]interface{}{result} } -func expandEventBridgeDataSourceConfig(l []interface{}) *awstypes.EventBridgeDataSourceConfig { +func expandEventBridgeDataSourceConfig(l []interface{}) *appsync.EventBridgeDataSourceConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.EventBridgeDataSourceConfig{ + result := &appsync.EventBridgeDataSourceConfig{ EventBusArn: aws.String(configured["event_bus_arn"].(string)), } return result } -func flattenEventBridgeDataSourceConfig(config *awstypes.EventBridgeDataSourceConfig) []map[string]interface{} { +func flattenEventBridgeDataSourceConfig(config *appsync.EventBridgeDataSourceConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "event_bus_arn": aws.ToString(config.EventBusArn), + "event_bus_arn": aws.StringValue(config.EventBusArn), } return []map[string]interface{}{result} } -func testAccDataSourceConfig_expandRDSHTTPEndpoint(l []interface{}, currentRegion string) *awstypes.RdsHttpEndpointConfig { +func testAccDataSourceConfig_expandRDSHTTPEndpoint(l []interface{}, currentRegion string) *appsync.RdsHttpEndpointConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.RdsHttpEndpointConfig{ + result := &appsync.RdsHttpEndpointConfig{ AwsRegion: aws.String(currentRegion), } @@ -884,7 +892,7 @@ func testAccDataSourceConfig_expandRDSHTTPEndpoint(l []interface{}, currentRegio return result } -func flattenRDSHTTPEndpointConfig(config *awstypes.RdsHttpEndpointConfig) []map[string]interface{} { +func flattenRDSHTTPEndpointConfig(config *appsync.RdsHttpEndpointConfig) []map[string]interface{} { if config == nil { return nil } @@ -892,23 +900,23 @@ func flattenRDSHTTPEndpointConfig(config *awstypes.RdsHttpEndpointConfig) []map[ result := map[string]interface{}{} if config.AwsRegion != nil { - result["region"] = aws.ToString(config.AwsRegion) + result["region"] = aws.StringValue(config.AwsRegion) } if config.AwsSecretStoreArn != nil { - result["aws_secret_store_arn"] = aws.ToString(config.AwsSecretStoreArn) + result["aws_secret_store_arn"] = aws.StringValue(config.AwsSecretStoreArn) } if config.DatabaseName != nil { - result["database_name"] = aws.ToString(config.DatabaseName) + result["database_name"] = aws.StringValue(config.DatabaseName) } if config.DbClusterIdentifier != nil { - result["db_cluster_identifier"] = aws.ToString(config.DbClusterIdentifier) + result["db_cluster_identifier"] = aws.StringValue(config.DbClusterIdentifier) } if config.Schema != nil { - result["schema"] = aws.ToString(config.Schema) + result["schema"] = aws.StringValue(config.Schema) } return []map[string]interface{}{result} diff --git a/internal/service/appsync/datasource_test.go b/internal/service/appsync/datasource_test.go index 767087fa259..d249845be55 100644 --- a/internal/service/appsync/datasource_test.go +++ b/internal/service/appsync/datasource_test.go @@ -9,6 +9,7 @@ import ( "testing" "github.com/YakDriver/regexache" + "github.com/aws/aws-sdk-go/service/appsync" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -26,7 +27,7 @@ func testAccDataSource_basic(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -63,7 +64,7 @@ func testAccDataSource_description(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -97,7 +98,7 @@ func testAccDataSource_DynamoDB_region(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -133,7 +134,7 @@ func testAccDataSource_DynamoDB_useCallerCredentials(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -170,7 +171,7 @@ func TestAccAppSyncDataSource_Elasticsearch_region(t *testing.T) { // Keep this test Parallel as it takes considerably longer to run than any non-Elasticsearch tests. resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -207,7 +208,7 @@ func TestAccAppSyncDataSource_OpenSearchService_region(t *testing.T) { // Keep this test Parallel as it takes considerably longer to run than any non-OpenSearchService tests. resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -243,7 +244,7 @@ func testAccDataSource_HTTP_endpoint(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -281,7 +282,7 @@ func testAccDataSource_type(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -312,7 +313,7 @@ func testAccDataSource_Type_dynamoDB(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -345,7 +346,7 @@ func TestAccAppSyncDataSource_Type_elasticSearch(t *testing.T) { // Keep this test Parallel as it takes considerably longer to run than any non-Elasticsearch tests. resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -378,7 +379,7 @@ func TestAccAppSyncDataSource_Type_openSearchService(t *testing.T) { // Keep this test Parallel as it takes considerably longer to run than any non-OpenSearchService tests. resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -409,7 +410,7 @@ func testAccDataSource_Type_http(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -438,7 +439,7 @@ func testAccDataSource_Type_httpAuth(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -472,7 +473,7 @@ func testAccDataSource_Type_relationalDatabase(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -501,7 +502,7 @@ func testAccDataSource_Type_relationalDatabaseWithOptions(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -534,7 +535,7 @@ func testAccDataSource_Type_lambda(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -566,7 +567,7 @@ func testAccDataSource_Type_eventBridge(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -596,7 +597,7 @@ func testAccDataSource_Type_none(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -619,7 +620,7 @@ func testAccDataSource_Type_none(t *testing.T) { func testAccCheckDataSourceDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_datasource" { continue @@ -665,7 +666,7 @@ func testAccCheckExistsDataSource(ctx context.Context, name string) resource.Tes return err } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) _, err = tfappsync.FindDataSourceByTwoPartKey(ctx, conn, apiID, name) diff --git a/internal/service/appsync/domain_name.go b/internal/service/appsync/domain_name.go index a81d2d4c264..89c6e67b1f4 100644 --- a/internal/service/appsync/domain_name.go +++ b/internal/service/appsync/domain_name.go @@ -9,14 +9,13 @@ import ( "log" "time" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" @@ -63,7 +62,7 @@ func ResourceDomainName() *schema.Resource { func resourceDomainNameCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) params := &appsync.CreateDomainNameInput{ CertificateArn: aws.String(d.Get("certificate_arn").(string)), @@ -71,19 +70,19 @@ func resourceDomainNameCreate(ctx context.Context, d *schema.ResourceData, meta DomainName: aws.String(d.Get("domain_name").(string)), } - resp, err := conn.CreateDomainName(ctx, params) + resp, err := conn.CreateDomainNameWithContext(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync Domain Name: %s", err) } - d.SetId(aws.ToString(resp.DomainNameConfig.DomainName)) + d.SetId(aws.StringValue(resp.DomainNameConfig.DomainName)) return append(diags, resourceDomainNameRead(ctx, d, meta)...) } func resourceDomainNameRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) domainName, err := FindDomainNameByID(ctx, conn, d.Id()) if domainName == nil && !d.IsNewResource() { @@ -107,7 +106,7 @@ func resourceDomainNameRead(ctx context.Context, d *schema.ResourceData, meta in func resourceDomainNameUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) params := &appsync.UpdateDomainNameInput{ DomainName: aws.String(d.Id()), @@ -117,7 +116,7 @@ func resourceDomainNameUpdate(ctx context.Context, d *schema.ResourceData, meta params.Description = aws.String(d.Get("description").(string)) } - _, err := conn.UpdateDomainName(ctx, params) + _, err := conn.UpdateDomainNameWithContext(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "updating Appsync Domain Name %q: %s", d.Id(), err) } @@ -127,15 +126,15 @@ func resourceDomainNameUpdate(ctx context.Context, d *schema.ResourceData, meta func resourceDomainNameDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) input := &appsync.DeleteDomainNameInput{ DomainName: aws.String(d.Id()), } err := retry.RetryContext(ctx, 5*time.Minute, func() *retry.RetryError { - _, err := conn.DeleteDomainName(ctx, input) - if errs.IsA[*awstypes.ConcurrentModificationException](err) { + _, err := conn.DeleteDomainNameWithContext(ctx, input) + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeConcurrentModificationException) { return retry.RetryableError(fmt.Errorf("deleting Appsync Domain Name %q: %w", d.Id(), err)) } if err != nil { @@ -145,7 +144,7 @@ func resourceDomainNameDelete(ctx context.Context, d *schema.ResourceData, meta return nil }) if tfresource.TimedOut(err) { - _, err = conn.DeleteDomainName(ctx, input) + _, err = conn.DeleteDomainNameWithContext(ctx, input) } if err != nil { return sdkdiag.AppendErrorf(diags, "deleting Appsync Domain Name %q: %s", d.Id(), err) diff --git a/internal/service/appsync/domain_name_api_association.go b/internal/service/appsync/domain_name_api_association.go index eaefa4dc40f..1bff3ff4717 100644 --- a/internal/service/appsync/domain_name_api_association.go +++ b/internal/service/appsync/domain_name_api_association.go @@ -7,13 +7,12 @@ import ( "context" "log" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" ) @@ -44,19 +43,19 @@ func ResourceDomainNameAPIAssociation() *schema.Resource { func resourceDomainNameAPIAssociationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) params := &appsync.AssociateApiInput{ ApiId: aws.String(d.Get("api_id").(string)), DomainName: aws.String(d.Get("domain_name").(string)), } - resp, err := conn.AssociateApi(ctx, params) + resp, err := conn.AssociateApiWithContext(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync Domain Name API Association: %s", err) } - d.SetId(aws.ToString(resp.ApiAssociation.DomainName)) + d.SetId(aws.StringValue(resp.ApiAssociation.DomainName)) if err := waitDomainNameAPIAssociation(ctx, conn, d.Id()); err != nil { return sdkdiag.AppendErrorf(diags, "waiting for Appsync Domain Name API (%s) Association: %s", d.Id(), err) @@ -67,7 +66,7 @@ func resourceDomainNameAPIAssociationCreate(ctx context.Context, d *schema.Resou func resourceDomainNameAPIAssociationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) association, err := FindDomainNameAPIAssociationByID(ctx, conn, d.Id()) if association == nil && !d.IsNewResource() { @@ -88,14 +87,14 @@ func resourceDomainNameAPIAssociationRead(ctx context.Context, d *schema.Resourc func resourceDomainNameAPIAssociationUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) params := &appsync.AssociateApiInput{ ApiId: aws.String(d.Get("api_id").(string)), DomainName: aws.String(d.Get("domain_name").(string)), } - _, err := conn.AssociateApi(ctx, params) + _, err := conn.AssociateApiWithContext(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync Domain Name API Association: %s", err) } @@ -109,14 +108,14 @@ func resourceDomainNameAPIAssociationUpdate(ctx context.Context, d *schema.Resou func resourceDomainNameAPIAssociationDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) input := &appsync.DisassociateApiInput{ DomainName: aws.String(d.Id()), } - _, err := conn.DisassociateApi(ctx, input) + _, err := conn.DisassociateApiWithContext(ctx, input) if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return diags } return sdkdiag.AppendErrorf(diags, "deleting Appsync Domain Name API Association: %s", err) diff --git a/internal/service/appsync/domain_name_api_association_test.go b/internal/service/appsync/domain_name_api_association_test.go index 2b1fc249a8b..b80fe4265fb 100644 --- a/internal/service/appsync/domain_name_api_association_test.go +++ b/internal/service/appsync/domain_name_api_association_test.go @@ -8,28 +8,28 @@ import ( "fmt" "testing" - "github.com/aws/aws-sdk-go-v2/aws" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/errs" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" "github.com/hashicorp/terraform-provider-aws/names" ) func testAccDomainNameAPIAssociation_basic(t *testing.T) { ctx := acctest.Context(t) - var association awstypes.ApiAssociation + var association appsync.ApiAssociation appsyncCertDomain := getCertDomain(t) rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name_api_association.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameAPIAssociationDestroy(ctx), @@ -61,14 +61,14 @@ func testAccDomainNameAPIAssociation_basic(t *testing.T) { func testAccDomainNameAPIAssociation_disappears(t *testing.T) { ctx := acctest.Context(t) - var association awstypes.ApiAssociation + var association appsync.ApiAssociation appsyncCertDomain := getCertDomain(t) rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name_api_association.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameAPIAssociationDestroy(ctx), @@ -87,7 +87,7 @@ func testAccDomainNameAPIAssociation_disappears(t *testing.T) { func testAccCheckDomainNameAPIAssociationDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_domain_name" { continue @@ -95,13 +95,13 @@ func testAccCheckDomainNameAPIAssociationDestroy(ctx context.Context) resource.T association, err := tfappsync.FindDomainNameAPIAssociationByID(ctx, conn, rs.Primary.ID) if err == nil { - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return nil } return err } - if association != nil && aws.ToString(association.DomainName) == rs.Primary.ID { + if association != nil && aws.StringValue(association.DomainName) == rs.Primary.ID { return fmt.Errorf("Appsync Domain Name ID %q still exists", rs.Primary.ID) } @@ -111,13 +111,13 @@ func testAccCheckDomainNameAPIAssociationDestroy(ctx context.Context) resource.T } } -func testAccCheckDomainNameAPIAssociationExists(ctx context.Context, resourceName string, DomainNameAPIAssociation *awstypes.ApiAssociation) resource.TestCheckFunc { +func testAccCheckDomainNameAPIAssociationExists(ctx context.Context, resourceName string, DomainNameAPIAssociation *appsync.ApiAssociation) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Appsync Domain Name Not found in state: %s", resourceName) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) association, err := tfappsync.FindDomainNameAPIAssociationByID(ctx, conn, rs.Primary.ID) if err != nil { diff --git a/internal/service/appsync/domain_name_test.go b/internal/service/appsync/domain_name_test.go index 732ac780e9c..f06968b1e2f 100644 --- a/internal/service/appsync/domain_name_test.go +++ b/internal/service/appsync/domain_name_test.go @@ -8,21 +8,21 @@ import ( "fmt" "testing" - "github.com/aws/aws-sdk-go-v2/aws" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/errs" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" "github.com/hashicorp/terraform-provider-aws/names" ) func testAccDomainName_basic(t *testing.T) { ctx := acctest.Context(t) - var domainName awstypes.DomainNameConfig + var domainName appsync.DomainNameConfig appsyncCertDomain := getCertDomain(t) rName := sdkacctest.RandString(8) @@ -30,7 +30,7 @@ func testAccDomainName_basic(t *testing.T) { resourceName := "aws_appsync_domain_name.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameDestroy(ctx), @@ -54,14 +54,14 @@ func testAccDomainName_basic(t *testing.T) { func testAccDomainName_description(t *testing.T) { ctx := acctest.Context(t) - var domainName awstypes.DomainNameConfig + var domainName appsync.DomainNameConfig appsyncCertDomain := getCertDomain(t) rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameDestroy(ctx), @@ -91,14 +91,14 @@ func testAccDomainName_description(t *testing.T) { func testAccDomainName_disappears(t *testing.T) { ctx := acctest.Context(t) - var domainName awstypes.DomainNameConfig + var domainName appsync.DomainNameConfig appsyncCertDomain := getCertDomain(t) rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameDestroy(ctx), @@ -117,7 +117,7 @@ func testAccDomainName_disappears(t *testing.T) { func testAccCheckDomainNameDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_domain_name" { continue @@ -125,13 +125,13 @@ func testAccCheckDomainNameDestroy(ctx context.Context) resource.TestCheckFunc { domainName, err := tfappsync.FindDomainNameByID(ctx, conn, rs.Primary.ID) if err == nil { - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return nil } return err } - if domainName != nil && aws.ToString(domainName.DomainName) == rs.Primary.ID { + if domainName != nil && aws.StringValue(domainName.DomainName) == rs.Primary.ID { return fmt.Errorf("Appsync Domain Name ID %q still exists", rs.Primary.ID) } @@ -141,13 +141,13 @@ func testAccCheckDomainNameDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckDomainNameExists(ctx context.Context, resourceName string, domainName *awstypes.DomainNameConfig) resource.TestCheckFunc { +func testAccCheckDomainNameExists(ctx context.Context, resourceName string, domainName *appsync.DomainNameConfig) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] if !ok { return fmt.Errorf("Appsync Domain Name Not found in state: %s", resourceName) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) domain, err := tfappsync.FindDomainNameByID(ctx, conn, rs.Primary.ID) if err != nil { diff --git a/internal/service/appsync/find.go b/internal/service/appsync/find.go index 10b26f2ca65..05906df4040 100644 --- a/internal/service/appsync/find.go +++ b/internal/service/appsync/find.go @@ -6,21 +6,20 @@ package appsync import ( "context" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) -func FindAPICacheByID(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiCache, error) { +func FindAPICacheByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.ApiCache, error) { input := &appsync.GetApiCacheInput{ ApiId: aws.String(id), } - out, err := conn.GetApiCache(ctx, input) + out, err := conn.GetApiCacheWithContext(ctx, input) - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -38,13 +37,13 @@ func FindAPICacheByID(ctx context.Context, conn *appsync.Client, id string) (*aw return out.ApiCache, nil } -func FindDomainNameByID(ctx context.Context, conn *appsync.Client, id string) (*awstypes.DomainNameConfig, error) { +func FindDomainNameByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.DomainNameConfig, error) { input := &appsync.GetDomainNameInput{ DomainName: aws.String(id), } - out, err := conn.GetDomainName(ctx, input) + out, err := conn.GetDomainNameWithContext(ctx, input) - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -62,13 +61,13 @@ func FindDomainNameByID(ctx context.Context, conn *appsync.Client, id string) (* return out.DomainNameConfig, nil } -func FindDomainNameAPIAssociationByID(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiAssociation, error) { +func FindDomainNameAPIAssociationByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.ApiAssociation, error) { input := &appsync.GetApiAssociationInput{ DomainName: aws.String(id), } - out, err := conn.GetApiAssociation(ctx, input) + out, err := conn.GetApiAssociationWithContext(ctx, input) - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -86,16 +85,16 @@ func FindDomainNameAPIAssociationByID(ctx context.Context, conn *appsync.Client, return out.ApiAssociation, nil } -func FindTypeByThreePartKey(ctx context.Context, conn *appsync.Client, apiID, format, name string) (*awstypes.Type, error) { +func FindTypeByThreePartKey(ctx context.Context, conn *appsync.AppSync, apiID, format, name string) (*appsync.Type, error) { input := &appsync.GetTypeInput{ ApiId: aws.String(apiID), - Format: awstypes.TypeDefinitionFormat(format), + Format: aws.String(format), TypeName: aws.String(name), } - output, err := conn.GetType(ctx, input) + output, err := conn.GetTypeWithContext(ctx, input) - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, diff --git a/internal/service/appsync/function.go b/internal/service/appsync/function.go index c94071cbe81..f1135e3ce7b 100644 --- a/internal/service/appsync/function.go +++ b/internal/service/appsync/function.go @@ -10,15 +10,13 @@ import ( "strings" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/enum" - "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/verify" ) @@ -97,9 +95,9 @@ func ResourceFunction() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.RuntimeName](), + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice(appsync.RuntimeName_Values(), false), }, "runtime_version": { Type: schema.TypeString, @@ -115,14 +113,14 @@ func ResourceFunction() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "conflict_detection": { - Type: schema.TypeString, - Optional: true, - ValidateDiagFunc: enum.Validate[awstypes.ConflictDetectionType](), + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice(appsync.ConflictDetectionType_Values(), false), }, "conflict_handler": { - Type: schema.TypeString, - Optional: true, - ValidateDiagFunc: enum.Validate[awstypes.ConflictHandlerType](), + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice(appsync.ConflictHandlerType_Values(), false), }, "lambda_conflict_handler_config": { Type: schema.TypeList, @@ -147,7 +145,7 @@ func ResourceFunction() *schema.Resource { func resourceFunctionCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID := d.Get("api_id").(string) @@ -176,7 +174,7 @@ func resourceFunctionCreate(ctx context.Context, d *schema.ResourceData, meta in } if v, ok := d.GetOkExists("max_batch_size"); ok { - input.MaxBatchSize = int32(v.(int)) + input.MaxBatchSize = aws.Int64(int64(v.(int))) } if v, ok := d.GetOk("sync_config"); ok && len(v.([]interface{})) > 0 { @@ -187,19 +185,19 @@ func resourceFunctionCreate(ctx context.Context, d *schema.ResourceData, meta in input.Runtime = expandRuntime(v.([]interface{})) } - resp, err := conn.CreateFunction(ctx, input) + resp, err := conn.CreateFunctionWithContext(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "creating AppSync Function: %s", err) } - d.SetId(fmt.Sprintf("%s-%s", apiID, aws.ToString(resp.FunctionConfiguration.FunctionId))) + d.SetId(fmt.Sprintf("%s-%s", apiID, aws.StringValue(resp.FunctionConfiguration.FunctionId))) return append(diags, resourceFunctionRead(ctx, d, meta)...) } func resourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID, functionID, err := DecodeFunctionID(d.Id()) if err != nil { @@ -211,8 +209,8 @@ func resourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta inte FunctionId: aws.String(functionID), } - resp, err := conn.GetFunction(ctx, input) - if errs.IsA[*awstypes.NotFoundException](err) && !d.IsNewResource() { + resp, err := conn.GetFunctionWithContext(ctx, input) + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) && !d.IsNewResource() { log.Printf("[WARN] AppSync Function (%s) not found, removing from state", d.Id()) d.SetId("") return diags @@ -247,7 +245,7 @@ func resourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta inte func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID, functionID, err := DecodeFunctionID(d.Id()) if err != nil { @@ -279,7 +277,7 @@ func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta in } if v, ok := d.GetOk("max_batch_size"); ok { - input.MaxBatchSize = int32(v.(int)) + input.MaxBatchSize = aws.Int64(int64(v.(int))) } if v, ok := d.GetOk("sync_config"); ok && len(v.([]interface{})) > 0 { @@ -290,7 +288,7 @@ func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta in input.Runtime = expandRuntime(v.([]interface{})) } - _, err = conn.UpdateFunction(ctx, input) + _, err = conn.UpdateFunctionWithContext(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "updating AppSync Function (%s): %s", d.Id(), err) } @@ -300,7 +298,7 @@ func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta in func resourceFunctionDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID, functionID, err := DecodeFunctionID(d.Id()) if err != nil { @@ -312,8 +310,8 @@ func resourceFunctionDelete(ctx context.Context, d *schema.ResourceData, meta in FunctionId: aws.String(functionID), } - _, err = conn.DeleteFunction(ctx, input) - if errs.IsA[*awstypes.NotFoundException](err) { + _, err = conn.DeleteFunctionWithContext(ctx, input) + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return diags } if err != nil { @@ -331,17 +329,17 @@ func DecodeFunctionID(id string) (string, string, error) { return idParts[0], idParts[1], nil } -func expandRuntime(l []interface{}) *awstypes.AppSyncRuntime { +func expandRuntime(l []interface{}) *appsync.AppSyncRuntime { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.AppSyncRuntime{} + result := &appsync.AppSyncRuntime{} if v, ok := configured["name"].(string); ok { - result.Name = awstypes.RuntimeName(v) + result.Name = aws.String(v) } if v, ok := configured["runtime_version"].(string); ok { @@ -351,34 +349,34 @@ func expandRuntime(l []interface{}) *awstypes.AppSyncRuntime { return result } -func flattenRuntime(config *awstypes.AppSyncRuntime) []map[string]interface{} { +func flattenRuntime(config *appsync.AppSyncRuntime) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "name": string(config.Name), - "runtime_version": aws.ToString(config.RuntimeVersion), + "name": aws.StringValue(config.Name), + "runtime_version": aws.StringValue(config.RuntimeVersion), } return []map[string]interface{}{result} } -func expandSyncConfig(l []interface{}) *awstypes.SyncConfig { +func expandSyncConfig(l []interface{}) *appsync.SyncConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.SyncConfig{} + result := &appsync.SyncConfig{} if v, ok := configured["conflict_detection"].(string); ok { - result.ConflictDetection = awstypes.ConflictDetectionType(v) + result.ConflictDetection = aws.String(v) } if v, ok := configured["conflict_handler"].(string); ok { - result.ConflictHandler = awstypes.ConflictHandlerType(v) + result.ConflictHandler = aws.String(v) } if v, ok := configured["lambda_conflict_handler_config"].([]interface{}); ok && len(v) > 0 { @@ -388,28 +386,28 @@ func expandSyncConfig(l []interface{}) *awstypes.SyncConfig { return result } -func flattenSyncConfig(config *awstypes.SyncConfig) []map[string]interface{} { +func flattenSyncConfig(config *appsync.SyncConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "conflict_detection": string(config.ConflictDetection), - "conflict_handler": string(config.ConflictHandler), + "conflict_detection": aws.StringValue(config.ConflictDetection), + "conflict_handler": aws.StringValue(config.ConflictHandler), "lambda_conflict_handler_config": flattenLambdaConflictHandlerConfig(config.LambdaConflictHandlerConfig), } return []map[string]interface{}{result} } -func expandLambdaConflictHandlerConfig(l []interface{}) *awstypes.LambdaConflictHandlerConfig { +func expandLambdaConflictHandlerConfig(l []interface{}) *appsync.LambdaConflictHandlerConfig { if len(l) == 0 || l[0] == nil { return nil } configured := l[0].(map[string]interface{}) - result := &awstypes.LambdaConflictHandlerConfig{} + result := &appsync.LambdaConflictHandlerConfig{} if v, ok := configured["lambda_conflict_handler_arn"].(string); ok { result.LambdaConflictHandlerArn = aws.String(v) @@ -418,13 +416,13 @@ func expandLambdaConflictHandlerConfig(l []interface{}) *awstypes.LambdaConflict return result } -func flattenLambdaConflictHandlerConfig(config *awstypes.LambdaConflictHandlerConfig) []map[string]interface{} { +func flattenLambdaConflictHandlerConfig(config *appsync.LambdaConflictHandlerConfig) []map[string]interface{} { if config == nil { return nil } result := map[string]interface{}{ - "lambda_conflict_handler_arn": aws.ToString(config.LambdaConflictHandlerArn), + "lambda_conflict_handler_arn": aws.StringValue(config.LambdaConflictHandlerArn), } return []map[string]interface{}{result} diff --git a/internal/service/appsync/function_test.go b/internal/service/appsync/function_test.go index e413e54a13b..d546ca3efa0 100644 --- a/internal/service/appsync/function_test.go +++ b/internal/service/appsync/function_test.go @@ -9,15 +9,14 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/errs" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -28,10 +27,10 @@ func testAccFunction_basic(t *testing.T) { rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) rName3 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config awstypes.FunctionConfiguration + var config appsync.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -71,10 +70,10 @@ func testAccFunction_code(t *testing.T) { rName1 := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config awstypes.FunctionConfiguration + var config appsync.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -114,10 +113,10 @@ func testAccFunction_syncConfig(t *testing.T) { ctx := acctest.Context(t) rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_function.test" - var config awstypes.FunctionConfiguration + var config appsync.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -145,10 +144,10 @@ func testAccFunction_description(t *testing.T) { rName1 := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config awstypes.FunctionConfiguration + var config appsync.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -181,10 +180,10 @@ func testAccFunction_responseMappingTemplate(t *testing.T) { rName1 := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config awstypes.FunctionConfiguration + var config appsync.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -209,10 +208,10 @@ func testAccFunction_disappears(t *testing.T) { rName1 := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config awstypes.FunctionConfiguration + var config appsync.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -231,7 +230,7 @@ func testAccFunction_disappears(t *testing.T) { func testAccCheckFunctionDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_function" { continue @@ -247,9 +246,9 @@ func testAccCheckFunctionDestroy(ctx context.Context) resource.TestCheckFunc { FunctionId: aws.String(functionID), } - _, err = conn.GetFunction(ctx, input) + _, err = conn.GetFunctionWithContext(ctx, input) if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return nil } return err @@ -259,14 +258,14 @@ func testAccCheckFunctionDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckFunctionExists(ctx context.Context, name string, config *awstypes.FunctionConfiguration) resource.TestCheckFunc { +func testAccCheckFunctionExists(ctx context.Context, name string, config *appsync.FunctionConfiguration) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] if !ok { return fmt.Errorf("Not found: %s", name) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) apiID, functionID, err := tfappsync.DecodeFunctionID(rs.Primary.ID) if err != nil { @@ -278,7 +277,7 @@ func testAccCheckFunctionExists(ctx context.Context, name string, config *awstyp FunctionId: aws.String(functionID), } - output, err := conn.GetFunction(ctx, input) + output, err := conn.GetFunctionWithContext(ctx, input) if err != nil { return err diff --git a/internal/service/appsync/generate.go b/internal/service/appsync/generate.go index 93bd9782d71..3efb706569b 100644 --- a/internal/service/appsync/generate.go +++ b/internal/service/appsync/generate.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -//go:generate go run ../../generate/tags/main.go -AWSSDKVersion=2 -ListTags -ServiceTagsMap -UpdateTags -KVTValues -SkipTypesImp +//go:generate go run ../../generate/tags/main.go -ListTags -ServiceTagsMap -UpdateTags //go:generate go run ../../generate/servicepackage/main.go // ONLY generate directives and package declaration! Do not add anything else to this file. diff --git a/internal/service/appsync/graphql_api.go b/internal/service/appsync/graphql_api.go index 4145f4f9a81..a2d3f26bb61 100644 --- a/internal/service/appsync/graphql_api.go +++ b/internal/service/appsync/graphql_api.go @@ -11,16 +11,14 @@ import ( "time" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/enum" - "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -52,9 +50,9 @@ func ResourceGraphQLAPI() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "authentication_type": { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.AuthenticationType](), + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice(appsync.AuthenticationType_Values(), false), }, "lambda_authorizer_config": { Type: schema.TypeList, @@ -134,15 +132,15 @@ func ResourceGraphQLAPI() *schema.Resource { Computed: true, }, "authentication_type": { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.AuthenticationType](), + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice(appsync.AuthenticationType_Values(), false), }, "introspection_config": { - Type: schema.TypeString, - Optional: true, - Default: awstypes.GraphQLApiIntrospectionConfigEnabled, - ValidateDiagFunc: enum.Validate[awstypes.GraphQLApiIntrospectionConfig](), + Type: schema.TypeString, + Optional: true, + Default: appsync.GraphQLApiIntrospectionConfigEnabled, + ValidateFunc: validation.StringInSlice(appsync.GraphQLApiIntrospectionConfig_Values(), false), }, "lambda_authorizer_config": { Type: schema.TypeList, @@ -184,9 +182,9 @@ func ResourceGraphQLAPI() *schema.Resource { Default: false, }, "field_log_level": { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.FieldLogLevel](), + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice(appsync.FieldLogLevel_Values(), false), }, }, }, @@ -266,9 +264,9 @@ func ResourceGraphQLAPI() *schema.Resource { Computed: true, }, "default_action": { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.DefaultAction](), + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice(appsync.DefaultAction_Values(), false), }, "user_pool_id": { Type: schema.TypeString, @@ -278,11 +276,11 @@ func ResourceGraphQLAPI() *schema.Resource { }, }, "visibility": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - Default: string(awstypes.GraphQLApiVisibilityGlobal), - ValidateDiagFunc: enum.Validate[awstypes.GraphQLApiVisibility](), + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Default: appsync.GraphQLApiVisibilityGlobal, + ValidateFunc: validation.StringInSlice(appsync.GraphQLApiVisibility_Values(), false), }, "xray_enabled": { Type: schema.TypeBool, @@ -296,11 +294,11 @@ func ResourceGraphQLAPI() *schema.Resource { func resourceGraphQLAPICreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) name := d.Get("name").(string) input := &appsync.CreateGraphqlApiInput{ - AuthenticationType: awstypes.AuthenticationType(d.Get("authentication_type").(string)), + AuthenticationType: aws.String(d.Get("authentication_type").(string)), Name: aws.String(name), Tags: getTagsIn(ctx), } @@ -326,32 +324,32 @@ func resourceGraphQLAPICreate(ctx context.Context, d *schema.ResourceData, meta } if v, ok := d.GetOk("introspection_config"); ok { - input.IntrospectionConfig = awstypes.GraphQLApiIntrospectionConfig(v.(string)) + input.IntrospectionConfig = aws.String(v.(string)) } if v, ok := d.GetOk("query_depth_limit"); ok { - input.QueryDepthLimit = int32(v.(int)) + input.QueryDepthLimit = aws.Int64(int64(v.(int))) } if v, ok := d.GetOk("resolver_count_limit"); ok { - input.ResolverCountLimit = int32(v.(int)) + input.ResolverCountLimit = aws.Int64(int64(v.(int))) } if v, ok := d.GetOk("xray_enabled"); ok { - input.XrayEnabled = v.(bool) + input.XrayEnabled = aws.Bool(v.(bool)) } if v, ok := d.GetOk("visibility"); ok { - input.Visibility = awstypes.GraphQLApiVisibility(v.(string)) + input.Visibility = aws.String(v.(string)) } - output, err := conn.CreateGraphqlApi(ctx, input) + output, err := conn.CreateGraphqlApiWithContext(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "creating AppSync GraphQL API (%s): %s", name, err) } - d.SetId(aws.ToString(output.GraphqlApi.ApiId)) + d.SetId(aws.StringValue(output.GraphqlApi.ApiId)) if v, ok := d.GetOk("schema"); ok { if err := putSchema(ctx, conn, d.Id(), v.(string), d.Timeout(schema.TimeoutCreate)); err != nil { @@ -364,7 +362,7 @@ func resourceGraphQLAPICreate(ctx context.Context, d *schema.ResourceData, meta func resourceGraphQLAPIRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) api, err := FindGraphQLAPIByID(ctx, conn, d.Id()) @@ -396,7 +394,7 @@ func resourceGraphQLAPIRead(ctx context.Context, d *schema.ResourceData, meta in d.Set("name", api.Name) d.Set("query_depth_limit", api.QueryDepthLimit) d.Set("resolver_count_limit", api.ResolverCountLimit) - d.Set("uris", api.Uris) + d.Set("uris", aws.StringValueMap(api.Uris)) if err := d.Set("user_pool_config", flattenGraphQLAPIUserPoolConfig(api.UserPoolConfig)); err != nil { return sdkdiag.AppendErrorf(diags, "setting user_pool_config: %s", err) } @@ -412,12 +410,12 @@ func resourceGraphQLAPIRead(ctx context.Context, d *schema.ResourceData, meta in func resourceGraphQLAPIUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) if d.HasChangesExcept("tags", "tags_all") { input := &appsync.UpdateGraphqlApiInput{ ApiId: aws.String(d.Id()), - AuthenticationType: awstypes.AuthenticationType(d.Get("authentication_type").(string)), + AuthenticationType: aws.String(d.Get("authentication_type").(string)), Name: aws.String(d.Get("name").(string)), } @@ -442,22 +440,22 @@ func resourceGraphQLAPIUpdate(ctx context.Context, d *schema.ResourceData, meta } if v, ok := d.GetOk("introspection_config"); ok { - input.IntrospectionConfig = awstypes.GraphQLApiIntrospectionConfig(v.(string)) + input.IntrospectionConfig = aws.String(v.(string)) } if v, ok := d.GetOk("query_depth_limit"); ok { - input.QueryDepthLimit = int32(v.(int)) + input.QueryDepthLimit = aws.Int64(int64(v.(int))) } if v, ok := d.GetOk("resolver_count_limit"); ok { - input.ResolverCountLimit = int32(v.(int)) + input.ResolverCountLimit = aws.Int64(int64(v.(int))) } if v, ok := d.GetOk("xray_enabled"); ok { - input.XrayEnabled = v.(bool) + input.XrayEnabled = aws.Bool(v.(bool)) } - _, err := conn.UpdateGraphqlApi(ctx, input) + _, err := conn.UpdateGraphqlApiWithContext(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "updating AppSync GraphQL API (%s): %s", d.Id(), err) @@ -477,14 +475,14 @@ func resourceGraphQLAPIUpdate(ctx context.Context, d *schema.ResourceData, meta func resourceGraphQLAPIDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) log.Printf("[DEBUG] Deleting AppSync GraphQL API: %s", d.Id()) - _, err := conn.DeleteGraphqlApi(ctx, &appsync.DeleteGraphqlApiInput{ + _, err := conn.DeleteGraphqlApiWithContext(ctx, &appsync.DeleteGraphqlApiInput{ ApiId: aws.String(d.Id()), }) - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return diags } @@ -495,13 +493,13 @@ func resourceGraphQLAPIDelete(ctx context.Context, d *schema.ResourceData, meta return diags } -func putSchema(ctx context.Context, conn *appsync.Client, apiID, definition string, timeout time.Duration) error { +func putSchema(ctx context.Context, conn *appsync.AppSync, apiID, definition string, timeout time.Duration) error { input := &appsync.StartSchemaCreationInput{ ApiId: aws.String(apiID), Definition: ([]byte)(definition), } - _, err := conn.StartSchemaCreation(ctx, input) + _, err := conn.StartSchemaCreationWithContext(ctx, input) if err != nil { return fmt.Errorf("creating AppSync GraphQL API (%s) schema: %w", apiID, err) @@ -514,14 +512,14 @@ func putSchema(ctx context.Context, conn *appsync.Client, apiID, definition stri return nil } -func FindGraphQLAPIByID(ctx context.Context, conn *appsync.Client, id string) (*awstypes.GraphqlApi, error) { +func FindGraphQLAPIByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.GraphqlApi, error) { input := &appsync.GetGraphqlApiInput{ ApiId: aws.String(id), } - output, err := conn.GetGraphqlApi(ctx, input) + output, err := conn.GetGraphqlApiWithContext(ctx, input) - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -539,14 +537,14 @@ func FindGraphQLAPIByID(ctx context.Context, conn *appsync.Client, id string) (* return output.GraphqlApi, nil } -func findSchemaCreationStatusByID(ctx context.Context, conn *appsync.Client, id string) (*appsync.GetSchemaCreationStatusOutput, error) { +func findSchemaCreationStatusByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.GetSchemaCreationStatusOutput, error) { input := &appsync.GetSchemaCreationStatusInput{ ApiId: aws.String(id), } - output, err := conn.GetSchemaCreationStatus(ctx, input) + output, err := conn.GetSchemaCreationStatusWithContext(ctx, input) - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -564,7 +562,7 @@ func findSchemaCreationStatusByID(ctx context.Context, conn *appsync.Client, id return output, nil } -func statusSchemaCreation(ctx context.Context, conn *appsync.Client, id string) retry.StateRefreshFunc { +func statusSchemaCreation(ctx context.Context, conn *appsync.AppSync, id string) retry.StateRefreshFunc { return func() (interface{}, string, error) { output, err := findSchemaCreationStatusByID(ctx, conn, id) @@ -576,14 +574,14 @@ func statusSchemaCreation(ctx context.Context, conn *appsync.Client, id string) return nil, "", err } - return output, string(output.Status), nil + return output, aws.StringValue(output.Status), nil } } -func waitSchemaCreated(ctx context.Context, conn *appsync.Client, id string, timeout time.Duration) error { +func waitSchemaCreated(ctx context.Context, conn *appsync.AppSync, id string, timeout time.Duration) error { stateConf := &retry.StateChangeConf{ - Pending: enum.Slice(awstypes.SchemaStatusProcessing), - Target: enum.Slice(awstypes.SchemaStatusActive, awstypes.SchemaStatusSuccess), + Pending: []string{appsync.SchemaStatusProcessing}, + Target: []string{appsync.SchemaStatusActive, appsync.SchemaStatusSuccess}, Refresh: statusSchemaCreation(ctx, conn, id), Timeout: timeout, } @@ -591,41 +589,41 @@ func waitSchemaCreated(ctx context.Context, conn *appsync.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*appsync.GetSchemaCreationStatusOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Details))) + tfresource.SetLastError(err, errors.New(aws.StringValue(output.Details))) } return err } -func expandGraphQLAPILogConfig(l []interface{}) *awstypes.LogConfig { +func expandGraphQLAPILogConfig(l []interface{}) *appsync.LogConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - logConfig := &awstypes.LogConfig{ + logConfig := &appsync.LogConfig{ CloudWatchLogsRoleArn: aws.String(m["cloudwatch_logs_role_arn"].(string)), - FieldLogLevel: awstypes.FieldLogLevel(m["field_log_level"].(string)), - ExcludeVerboseContent: m["exclude_verbose_content"].(bool), + FieldLogLevel: aws.String(m["field_log_level"].(string)), + ExcludeVerboseContent: aws.Bool(m["exclude_verbose_content"].(bool)), } return logConfig } -func expandGraphQLAPIOpenIDConnectConfig(l []interface{}) *awstypes.OpenIDConnectConfig { +func expandGraphQLAPIOpenIDConnectConfig(l []interface{}) *appsync.OpenIDConnectConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - openIDConnectConfig := &awstypes.OpenIDConnectConfig{ + openIDConnectConfig := &appsync.OpenIDConnectConfig{ Issuer: aws.String(m["issuer"].(string)), } if v, ok := m["auth_ttl"].(int); ok && v != 0 { - openIDConnectConfig.AuthTTL = int64(v) + openIDConnectConfig.AuthTTL = aws.Int64(int64(v)) } if v, ok := m["client_id"].(string); ok && v != "" { @@ -633,22 +631,22 @@ func expandGraphQLAPIOpenIDConnectConfig(l []interface{}) *awstypes.OpenIDConnec } if v, ok := m["iat_ttl"].(int); ok && v != 0 { - openIDConnectConfig.IatTTL = int64(v) + openIDConnectConfig.IatTTL = aws.Int64(int64(v)) } return openIDConnectConfig } -func expandGraphQLAPIUserPoolConfig(l []interface{}, currentRegion string) *awstypes.UserPoolConfig { +func expandGraphQLAPIUserPoolConfig(l []interface{}, currentRegion string) *appsync.UserPoolConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - userPoolConfig := &awstypes.UserPoolConfig{ + userPoolConfig := &appsync.UserPoolConfig{ AwsRegion: aws.String(currentRegion), - DefaultAction: awstypes.DefaultAction(m["default_action"].(string)), + DefaultAction: aws.String(m["default_action"].(string)), UserPoolId: aws.String(m["user_pool_id"].(string)), } @@ -663,15 +661,15 @@ func expandGraphQLAPIUserPoolConfig(l []interface{}, currentRegion string) *awst return userPoolConfig } -func expandGraphQLAPILambdaAuthorizerConfig(l []interface{}) *awstypes.LambdaAuthorizerConfig { +func expandGraphQLAPILambdaAuthorizerConfig(l []interface{}) *appsync.LambdaAuthorizerConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - lambdaAuthorizerConfig := &awstypes.LambdaAuthorizerConfig{ - AuthorizerResultTtlInSeconds: int32(m["authorizer_result_ttl_in_seconds"].(int)), + lambdaAuthorizerConfig := &appsync.LambdaAuthorizerConfig{ + AuthorizerResultTtlInSeconds: aws.Int64(int64(m["authorizer_result_ttl_in_seconds"].(int))), AuthorizerUri: aws.String(m["authorizer_uri"].(string)), } @@ -682,20 +680,20 @@ func expandGraphQLAPILambdaAuthorizerConfig(l []interface{}) *awstypes.LambdaAut return lambdaAuthorizerConfig } -func expandGraphQLAPIAdditionalAuthProviders(items []interface{}, currentRegion string) []awstypes.AdditionalAuthenticationProvider { +func expandGraphQLAPIAdditionalAuthProviders(items []interface{}, currentRegion string) []*appsync.AdditionalAuthenticationProvider { if len(items) < 1 { return nil } - additionalAuthProviders := make([]awstypes.AdditionalAuthenticationProvider, 0, len(items)) + additionalAuthProviders := make([]*appsync.AdditionalAuthenticationProvider, 0, len(items)) for _, l := range items { if l == nil { continue } m := l.(map[string]interface{}) - additionalAuthProvider := awstypes.AdditionalAuthenticationProvider{ - AuthenticationType: awstypes.AuthenticationType(m["authentication_type"].(string)), + additionalAuthProvider := &appsync.AdditionalAuthenticationProvider{ + AuthenticationType: aws.String(m["authentication_type"].(string)), } if v, ok := m["openid_connect_config"]; ok { @@ -716,14 +714,14 @@ func expandGraphQLAPIAdditionalAuthProviders(items []interface{}, currentRegion return additionalAuthProviders } -func expandGraphQLAPICognitoUserPoolConfig(l []interface{}, currentRegion string) *awstypes.CognitoUserPoolConfig { +func expandGraphQLAPICognitoUserPoolConfig(l []interface{}, currentRegion string) *appsync.CognitoUserPoolConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - userPoolConfig := &awstypes.CognitoUserPoolConfig{ + userPoolConfig := &appsync.CognitoUserPoolConfig{ AwsRegion: aws.String(currentRegion), UserPoolId: aws.String(m["user_pool_id"].(string)), } @@ -739,72 +737,76 @@ func expandGraphQLAPICognitoUserPoolConfig(l []interface{}, currentRegion string return userPoolConfig } -func flattenGraphQLAPILogConfig(logConfig *awstypes.LogConfig) []interface{} { +func flattenGraphQLAPILogConfig(logConfig *appsync.LogConfig) []interface{} { if logConfig == nil { return []interface{}{} } m := map[string]interface{}{ - "cloudwatch_logs_role_arn": aws.ToString(logConfig.CloudWatchLogsRoleArn), - "field_log_level": string(logConfig.FieldLogLevel), - "exclude_verbose_content": logConfig.ExcludeVerboseContent, + "cloudwatch_logs_role_arn": aws.StringValue(logConfig.CloudWatchLogsRoleArn), + "field_log_level": aws.StringValue(logConfig.FieldLogLevel), + "exclude_verbose_content": aws.BoolValue(logConfig.ExcludeVerboseContent), } return []interface{}{m} } -func flattenGraphQLAPIOpenIDConnectConfig(openIDConnectConfig *awstypes.OpenIDConnectConfig) []interface{} { +func flattenGraphQLAPIOpenIDConnectConfig(openIDConnectConfig *appsync.OpenIDConnectConfig) []interface{} { if openIDConnectConfig == nil { return []interface{}{} } m := map[string]interface{}{ - "auth_ttl": openIDConnectConfig.AuthTTL, - "client_id": aws.ToString(openIDConnectConfig.ClientId), - "iat_ttl": openIDConnectConfig.IatTTL, - "issuer": aws.ToString(openIDConnectConfig.Issuer), + "auth_ttl": aws.Int64Value(openIDConnectConfig.AuthTTL), + "client_id": aws.StringValue(openIDConnectConfig.ClientId), + "iat_ttl": aws.Int64Value(openIDConnectConfig.IatTTL), + "issuer": aws.StringValue(openIDConnectConfig.Issuer), } return []interface{}{m} } -func flattenGraphQLAPIUserPoolConfig(userPoolConfig *awstypes.UserPoolConfig) []interface{} { +func flattenGraphQLAPIUserPoolConfig(userPoolConfig *appsync.UserPoolConfig) []interface{} { if userPoolConfig == nil { return []interface{}{} } m := map[string]interface{}{ - "aws_region": aws.ToString(userPoolConfig.AwsRegion), - "default_action": string(userPoolConfig.DefaultAction), - "user_pool_id": aws.ToString(userPoolConfig.UserPoolId), + "aws_region": aws.StringValue(userPoolConfig.AwsRegion), + "default_action": aws.StringValue(userPoolConfig.DefaultAction), + "user_pool_id": aws.StringValue(userPoolConfig.UserPoolId), } if userPoolConfig.AppIdClientRegex != nil { - m["app_id_client_regex"] = aws.ToString(userPoolConfig.AppIdClientRegex) + m["app_id_client_regex"] = aws.StringValue(userPoolConfig.AppIdClientRegex) } return []interface{}{m} } -func flattenGraphQLAPILambdaAuthorizerConfig(lambdaAuthorizerConfig *awstypes.LambdaAuthorizerConfig) []interface{} { +func flattenGraphQLAPILambdaAuthorizerConfig(lambdaAuthorizerConfig *appsync.LambdaAuthorizerConfig) []interface{} { if lambdaAuthorizerConfig == nil { return []interface{}{} } m := map[string]interface{}{ - "authorizer_uri": aws.ToString(lambdaAuthorizerConfig.AuthorizerUri), + "authorizer_uri": aws.StringValue(lambdaAuthorizerConfig.AuthorizerUri), } - m["authorizer_result_ttl_in_seconds"] = lambdaAuthorizerConfig.AuthorizerResultTtlInSeconds + if lambdaAuthorizerConfig.AuthorizerResultTtlInSeconds != nil { + m["authorizer_result_ttl_in_seconds"] = aws.Int64Value(lambdaAuthorizerConfig.AuthorizerResultTtlInSeconds) + } else { + m["authorizer_result_ttl_in_seconds"] = DefaultAuthorizerResultTTLInSeconds + } if lambdaAuthorizerConfig.IdentityValidationExpression != nil { - m["identity_validation_expression"] = aws.ToString(lambdaAuthorizerConfig.IdentityValidationExpression) + m["identity_validation_expression"] = aws.StringValue(lambdaAuthorizerConfig.IdentityValidationExpression) } return []interface{}{m} } -func flattenGraphQLAPIAdditionalAuthenticationProviders(additionalAuthenticationProviders []awstypes.AdditionalAuthenticationProvider) []interface{} { +func flattenGraphQLAPIAdditionalAuthenticationProviders(additionalAuthenticationProviders []*appsync.AdditionalAuthenticationProvider) []interface{} { if len(additionalAuthenticationProviders) == 0 { return []interface{}{} } @@ -812,7 +814,7 @@ func flattenGraphQLAPIAdditionalAuthenticationProviders(additionalAuthentication result := make([]interface{}, len(additionalAuthenticationProviders)) for i, provider := range additionalAuthenticationProviders { result[i] = map[string]interface{}{ - "authentication_type": string(provider.AuthenticationType), + "authentication_type": aws.StringValue(provider.AuthenticationType), "lambda_authorizer_config": flattenGraphQLAPILambdaAuthorizerConfig(provider.LambdaAuthorizerConfig), "openid_connect_config": flattenGraphQLAPIOpenIDConnectConfig(provider.OpenIDConnectConfig), "user_pool_config": flattenGraphQLAPICognitoUserPoolConfig(provider.UserPoolConfig), @@ -822,18 +824,18 @@ func flattenGraphQLAPIAdditionalAuthenticationProviders(additionalAuthentication return result } -func flattenGraphQLAPICognitoUserPoolConfig(userPoolConfig *awstypes.CognitoUserPoolConfig) []interface{} { +func flattenGraphQLAPICognitoUserPoolConfig(userPoolConfig *appsync.CognitoUserPoolConfig) []interface{} { if userPoolConfig == nil { return []interface{}{} } m := map[string]interface{}{ - "aws_region": aws.ToString(userPoolConfig.AwsRegion), - "user_pool_id": aws.ToString(userPoolConfig.UserPoolId), + "aws_region": aws.StringValue(userPoolConfig.AwsRegion), + "user_pool_id": aws.StringValue(userPoolConfig.UserPoolId), } if userPoolConfig.AppIdClientRegex != nil { - m["app_id_client_regex"] = aws.ToString(userPoolConfig.AppIdClientRegex) + m["app_id_client_regex"] = aws.StringValue(userPoolConfig.AppIdClientRegex) } return []interface{}{m} diff --git a/internal/service/appsync/graphql_api_test.go b/internal/service/appsync/graphql_api_test.go index ae3ec0c52f5..5d4ad783877 100644 --- a/internal/service/appsync/graphql_api_test.go +++ b/internal/service/appsync/graphql_api_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/YakDriver/regexache" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/service/appsync" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -23,12 +23,12 @@ import ( func testAccGraphQLAPI_basic(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -66,12 +66,12 @@ func testAccGraphQLAPI_basic(t *testing.T) { func testAccGraphQLAPI_disappears(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -90,12 +90,12 @@ func testAccGraphQLAPI_disappears(t *testing.T) { func testAccGraphQLAPI_schema(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 awstypes.GraphqlApi + var api1, api2 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -137,12 +137,12 @@ func testAccGraphQLAPI_schema(t *testing.T) { func testAccGraphQLAPI_authenticationType(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 awstypes.GraphqlApi + var api1, api2 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -172,12 +172,12 @@ func testAccGraphQLAPI_authenticationType(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_apiKey(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -202,12 +202,12 @@ func testAccGraphQLAPI_AuthenticationType_apiKey(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_iam(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -232,13 +232,13 @@ func testAccGraphQLAPI_AuthenticationType_iam(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_amazonCognitoUserPools(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -265,12 +265,12 @@ func testAccGraphQLAPI_AuthenticationType_amazonCognitoUserPools(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_openIDConnect(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -295,13 +295,13 @@ func testAccGraphQLAPI_AuthenticationType_openIDConnect(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_lambda(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -328,13 +328,13 @@ func testAccGraphQLAPI_AuthenticationType_lambda(t *testing.T) { func testAccGraphQLAPI_log(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) iamRoleResourceName := "aws_iam_role.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -360,13 +360,13 @@ func testAccGraphQLAPI_log(t *testing.T) { func testAccGraphQLAPI_Log_fieldLogLevel(t *testing.T) { ctx := acctest.Context(t) - var api1, api2, api3 awstypes.GraphqlApi + var api1, api2, api3 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) iamRoleResourceName := "aws_iam_role.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -412,13 +412,13 @@ func testAccGraphQLAPI_Log_fieldLogLevel(t *testing.T) { func testAccGraphQLAPI_Log_excludeVerboseContent(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 awstypes.GraphqlApi + var api1, api2 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) iamRoleResourceName := "aws_iam_role.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -455,12 +455,12 @@ func testAccGraphQLAPI_Log_excludeVerboseContent(t *testing.T) { func testAccGraphQLAPI_OpenIDConnect_authTTL(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 awstypes.GraphqlApi + var api1, api2 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -496,12 +496,12 @@ func testAccGraphQLAPI_OpenIDConnect_authTTL(t *testing.T) { func testAccGraphQLAPI_OpenIDConnect_clientID(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 awstypes.GraphqlApi + var api1, api2 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -537,12 +537,12 @@ func testAccGraphQLAPI_OpenIDConnect_clientID(t *testing.T) { func testAccGraphQLAPI_OpenIDConnect_iatTTL(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 awstypes.GraphqlApi + var api1, api2 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -578,12 +578,12 @@ func testAccGraphQLAPI_OpenIDConnect_iatTTL(t *testing.T) { func testAccGraphQLAPI_OpenIDConnect_issuer(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 awstypes.GraphqlApi + var api1, api2 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -617,13 +617,13 @@ func testAccGraphQLAPI_OpenIDConnect_issuer(t *testing.T) { func testAccGraphQLAPI_name(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 awstypes.GraphqlApi + var api1, api2 appsync.GraphqlApi rName1 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) rName2 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -648,13 +648,13 @@ func testAccGraphQLAPI_name(t *testing.T) { func testAccGraphQLAPI_UserPool_region(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 awstypes.GraphqlApi + var api1, api2 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -692,13 +692,13 @@ func testAccGraphQLAPI_UserPool_region(t *testing.T) { func testAccGraphQLAPI_UserPool_defaultAction(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 awstypes.GraphqlApi + var api1, api2 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -736,13 +736,13 @@ func testAccGraphQLAPI_UserPool_defaultAction(t *testing.T) { func testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerURI(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 awstypes.GraphqlApi + var api1, api2 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -776,13 +776,13 @@ func testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerURI(t *testing.T) { func testAccGraphQLAPI_LambdaAuthorizerConfig_identityValidationExpression(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 awstypes.GraphqlApi + var api1, api2 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -818,12 +818,12 @@ func testAccGraphQLAPI_LambdaAuthorizerConfig_identityValidationExpression(t *te func testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerResultTTLInSeconds(t *testing.T) { ctx := acctest.Context(t) - var api1, api2, api3, api4 awstypes.GraphqlApi + var api1, api2, api3, api4 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -875,12 +875,12 @@ func testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerResultTTLInSeconds(t *te func testAccGraphQLAPI_tags(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -921,12 +921,12 @@ func testAccGraphQLAPI_tags(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_apiKey(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -956,12 +956,12 @@ func testAccGraphQLAPI_AdditionalAuthentication_apiKey(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_iam(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -991,13 +991,13 @@ func testAccGraphQLAPI_AdditionalAuthentication_iam(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_cognitoUserPools(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1028,12 +1028,12 @@ func testAccGraphQLAPI_AdditionalAuthentication_cognitoUserPools(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_openIDConnect(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1064,13 +1064,13 @@ func testAccGraphQLAPI_AdditionalAuthentication_openIDConnect(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_lambda(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1103,14 +1103,14 @@ func testAccGraphQLAPI_AdditionalAuthentication_lambda(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_multiple(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1155,12 +1155,12 @@ func testAccGraphQLAPI_AdditionalAuthentication_multiple(t *testing.T) { func testAccGraphQLAPI_xrayEnabled(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 awstypes.GraphqlApi + var api1, api2 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1185,12 +1185,12 @@ func testAccGraphQLAPI_xrayEnabled(t *testing.T) { func testAccGraphQLAPI_visibility(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1214,12 +1214,12 @@ func testAccGraphQLAPI_visibility(t *testing.T) { func testAccGraphQLAPI_introspectionConfig(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1242,12 +1242,12 @@ func testAccGraphQLAPI_introspectionConfig(t *testing.T) { func testAccGraphQLAPI_queryDepthLimit(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1270,12 +1270,12 @@ func testAccGraphQLAPI_queryDepthLimit(t *testing.T) { func testAccGraphQLAPI_resolverCountLimit(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi + var api1 appsync.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1298,7 +1298,7 @@ func testAccGraphQLAPI_resolverCountLimit(t *testing.T) { func testAccCheckGraphQLAPIDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_graphql_api" { continue @@ -1320,7 +1320,7 @@ func testAccCheckGraphQLAPIDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckGraphQLAPIExists(ctx context.Context, n string, v *awstypes.GraphqlApi) resource.TestCheckFunc { +func testAccCheckGraphQLAPIExists(ctx context.Context, n string, v *appsync.GraphqlApi) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -1331,7 +1331,7 @@ func testAccCheckGraphQLAPIExists(ctx context.Context, n string, v *awstypes.Gra return fmt.Errorf("No AppSync GraphQL API ID is set") } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) output, err := tfappsync.FindGraphQLAPIByID(ctx, conn, rs.Primary.ID) @@ -1352,9 +1352,9 @@ func testAccCheckGraphQLAPITypeExists(ctx context.Context, n, typeName string) r return fmt.Errorf("Not found: %s", n) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) - _, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.ID, string(awstypes.OutputTypeSdl), typeName) + _, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.ID, appsync.OutputTypeSdl, typeName) return err } diff --git a/internal/service/appsync/resolver.go b/internal/service/appsync/resolver.go index 3c626aeabdc..c010003b5b8 100644 --- a/internal/service/appsync/resolver.go +++ b/internal/service/appsync/resolver.go @@ -10,15 +10,13 @@ import ( "strings" "time" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/enum" - "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -85,10 +83,10 @@ func ResourceResolver() *schema.Resource { ForceNew: true, }, "kind": { - Type: schema.TypeString, - Optional: true, - Default: awstypes.ResolverKindUnit, - ValidateDiagFunc: enum.Validate[awstypes.ResolverKind](), + Type: schema.TypeString, + Optional: true, + Default: appsync.ResolverKindUnit, + ValidateFunc: validation.StringInSlice(appsync.ResolverKind_Values(), true), }, "max_batch_size": { Type: schema.TypeInt, @@ -128,9 +126,9 @@ func ResourceResolver() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.RuntimeName](), + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice(appsync.RuntimeName_Values(), false), }, "runtime_version": { Type: schema.TypeString, @@ -146,14 +144,14 @@ func ResourceResolver() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "conflict_detection": { - Type: schema.TypeString, - Optional: true, - ValidateDiagFunc: enum.Validate[awstypes.ConflictDetectionType](), + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice(appsync.ConflictDetectionType_Values(), false), }, "conflict_handler": { - Type: schema.TypeString, - Optional: true, - ValidateDiagFunc: enum.Validate[awstypes.ConflictHandlerType](), + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringInSlice(appsync.ConflictHandlerType_Values(), false), }, "lambda_conflict_handler_config": { Type: schema.TypeList, @@ -183,13 +181,13 @@ func ResourceResolver() *schema.Resource { func resourceResolverCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID, typeName, fieldName := d.Get("api_id").(string), d.Get("type").(string), d.Get("field").(string) input := &appsync.CreateResolverInput{ ApiId: aws.String(apiID), FieldName: aws.String(fieldName), - Kind: awstypes.ResolverKind(d.Get("kind").(string)), + Kind: aws.String(d.Get("kind").(string)), TypeName: aws.String(typeName), } @@ -198,7 +196,7 @@ func resourceResolverCreate(ctx context.Context, d *schema.ResourceData, meta in } if v, ok := d.GetOkExists("max_batch_size"); ok { - input.MaxBatchSize = int32(v.(int)) + input.MaxBatchSize = aws.Int64(int64(v.(int))) } if v, ok := d.GetOk("sync_config"); ok && len(v.([]interface{})) > 0 { @@ -233,9 +231,9 @@ func resourceResolverCreate(ctx context.Context, d *schema.ResourceData, meta in conns.GlobalMutexKV.Lock(mutexKey) defer conns.GlobalMutexKV.Unlock(mutexKey) - _, err := tfresource.RetryWhenIsA[*awstypes.ConcurrentModificationException](ctx, 2*time.Minute, func() (interface{}, error) { - return conn.CreateResolver(ctx, input) - }) + _, err := tfresource.RetryWhenAWSErrCodeEquals(ctx, 2*time.Minute, func() (interface{}, error) { + return conn.CreateResolverWithContext(ctx, input) + }, appsync.ErrCodeConcurrentModificationException) if err != nil { return sdkdiag.AppendErrorf(diags, "creating AppSync Resolver: %s", err) @@ -248,7 +246,7 @@ func resourceResolverCreate(ctx context.Context, d *schema.ResourceData, meta in func resourceResolverRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID, typeName, fieldName, err := DecodeResolverID(d.Id()) if err != nil { @@ -261,9 +259,9 @@ func resourceResolverRead(ctx context.Context, d *schema.ResourceData, meta inte FieldName: aws.String(fieldName), } - resp, err := conn.GetResolver(ctx, input) + resp, err := conn.GetResolverWithContext(ctx, input) - if errs.IsA[*awstypes.NotFoundException](err) && !d.IsNewResource() { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) && !d.IsNewResource() { log.Printf("[WARN] AppSync Resolver (%s) not found, removing from state", d.Id()) d.SetId("") return diags @@ -306,7 +304,7 @@ func resourceResolverRead(ctx context.Context, d *schema.ResourceData, meta inte func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID, typeName, fieldName, err := DecodeResolverID(d.Id()) if err != nil { @@ -316,7 +314,7 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in input := &appsync.UpdateResolverInput{ ApiId: aws.String(apiID), FieldName: aws.String(fieldName), - Kind: awstypes.ResolverKind(d.Get("kind").(string)), + Kind: aws.String(d.Get("kind").(string)), TypeName: aws.String(typeName), } @@ -330,8 +328,8 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in if v, ok := d.GetOk("pipeline_config"); ok { config := v.([]interface{})[0].(map[string]interface{}) - input.PipelineConfig = &awstypes.PipelineConfig{ - Functions: flex.ExpandStringValueList(config["functions"].([]interface{})), + input.PipelineConfig = &appsync.PipelineConfig{ + Functions: flex.ExpandStringList(config["functions"].([]interface{})), } } @@ -348,7 +346,7 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in } if v, ok := d.GetOkExists("max_batch_size"); ok { - input.MaxBatchSize = int32(v.(int)) + input.MaxBatchSize = aws.Int64(int64(v.(int))) } if v, ok := d.GetOk("sync_config"); ok && len(v.([]interface{})) > 0 { @@ -363,9 +361,9 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in conns.GlobalMutexKV.Lock(mutexKey) defer conns.GlobalMutexKV.Unlock(mutexKey) - _, err = tfresource.RetryWhenIsA[*awstypes.ConcurrentModificationException](ctx, 2*time.Minute, func() (interface{}, error) { - return conn.UpdateResolver(ctx, input) - }) + _, err = tfresource.RetryWhenAWSErrCodeEquals(ctx, 2*time.Minute, func() (interface{}, error) { + return conn.UpdateResolverWithContext(ctx, input) + }, appsync.ErrCodeConcurrentModificationException) if err != nil { return sdkdiag.AppendErrorf(diags, "updating AppSync Resolver (%s): %s", d.Id(), err) @@ -376,7 +374,7 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in func resourceResolverDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID, typeName, fieldName, err := DecodeResolverID(d.Id()) if err != nil { @@ -393,11 +391,11 @@ func resourceResolverDelete(ctx context.Context, d *schema.ResourceData, meta in conns.GlobalMutexKV.Lock(mutexKey) defer conns.GlobalMutexKV.Unlock(mutexKey) - _, err = tfresource.RetryWhenIsA[*awstypes.ConcurrentModificationException](ctx, 2*time.Minute, func() (interface{}, error) { - return conn.DeleteResolver(ctx, input) - }) + _, err = tfresource.RetryWhenAWSErrCodeEquals(ctx, 2*time.Minute, func() (interface{}, error) { + return conn.DeleteResolverWithContext(ctx, input) + }, appsync.ErrCodeConcurrentModificationException) - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return diags } @@ -416,41 +414,41 @@ func DecodeResolverID(id string) (string, string, string, error) { return idParts[0], idParts[1], idParts[2], nil } -func expandResolverCachingConfig(l []interface{}) *awstypes.CachingConfig { +func expandResolverCachingConfig(l []interface{}) *appsync.CachingConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - cachingConfig := &awstypes.CachingConfig{ - CachingKeys: flex.ExpandStringValueSet(m["caching_keys"].(*schema.Set)), + cachingConfig := &appsync.CachingConfig{ + CachingKeys: flex.ExpandStringSet(m["caching_keys"].(*schema.Set)), } if v, ok := m["ttl"].(int); ok && v != 0 { - cachingConfig.Ttl = int64(v) + cachingConfig.Ttl = aws.Int64(int64(v)) } return cachingConfig } -func expandPipelineConfig(l []interface{}) *awstypes.PipelineConfig { +func expandPipelineConfig(l []interface{}) *appsync.PipelineConfig { if len(l) < 1 || l[0] == nil { return nil } m := l[0].(map[string]interface{}) - config := &awstypes.PipelineConfig{} + config := &appsync.PipelineConfig{} if v, ok := m["functions"].([]interface{}); ok && len(v) > 0 { - config.Functions = flex.ExpandStringValueList(v) + config.Functions = flex.ExpandStringList(v) } return config } -func flattenPipelineConfig(c *awstypes.PipelineConfig) []interface{} { +func flattenPipelineConfig(c *appsync.PipelineConfig) []interface{} { if c == nil { return nil } @@ -460,24 +458,24 @@ func flattenPipelineConfig(c *awstypes.PipelineConfig) []interface{} { } m := map[string]interface{}{ - "functions": flex.FlattenStringValueList(c.Functions), + "functions": flex.FlattenStringList(c.Functions), } return []interface{}{m} } -func flattenCachingConfig(c *awstypes.CachingConfig) []interface{} { +func flattenCachingConfig(c *appsync.CachingConfig) []interface{} { if c == nil { return nil } - if len(c.CachingKeys) == 0 && c.Ttl == 0 { + if len(c.CachingKeys) == 0 && aws.Int64Value(c.Ttl) == 0 { return nil } m := map[string]interface{}{ - "caching_keys": flex.FlattenStringValueSet(c.CachingKeys), - "ttl": int(c.Ttl), + "caching_keys": flex.FlattenStringSet(c.CachingKeys), + "ttl": int(aws.Int64Value(c.Ttl)), } return []interface{}{m} diff --git a/internal/service/appsync/resolver_test.go b/internal/service/appsync/resolver_test.go index 5b2d8fea0c6..34174d2ba7c 100644 --- a/internal/service/appsync/resolver_test.go +++ b/internal/service/appsync/resolver_test.go @@ -9,27 +9,26 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/errs" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" "github.com/hashicorp/terraform-provider-aws/names" ) func testAccResolver_basic(t *testing.T) { ctx := acctest.Context(t) - var resolver1 awstypes.Resolver + var resolver1 appsync.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -57,12 +56,12 @@ func testAccResolver_basic(t *testing.T) { func testAccResolver_code(t *testing.T) { ctx := acctest.Context(t) - var resolver1 awstypes.Resolver + var resolver1 appsync.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -87,12 +86,12 @@ func testAccResolver_code(t *testing.T) { func testAccResolver_syncConfig(t *testing.T) { ctx := acctest.Context(t) - var resolver1 awstypes.Resolver + var resolver1 appsync.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -117,14 +116,14 @@ func testAccResolver_syncConfig(t *testing.T) { func testAccResolver_disappears(t *testing.T) { ctx := acctest.Context(t) - var api1 awstypes.GraphqlApi - var resolver1 awstypes.Resolver + var api1 appsync.GraphqlApi + var resolver1 appsync.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) appsyncGraphqlApiResourceName := "aws_appsync_graphql_api.test" resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -144,12 +143,12 @@ func testAccResolver_disappears(t *testing.T) { func testAccResolver_dataSource(t *testing.T) { ctx := acctest.Context(t) - var resolver1, resolver2 awstypes.Resolver + var resolver1, resolver2 appsync.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -179,12 +178,12 @@ func testAccResolver_dataSource(t *testing.T) { func testAccResolver_DataSource_lambda(t *testing.T) { ctx := acctest.Context(t) - var resolver awstypes.Resolver + var resolver appsync.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -207,12 +206,12 @@ func testAccResolver_DataSource_lambda(t *testing.T) { func testAccResolver_requestTemplate(t *testing.T) { ctx := acctest.Context(t) - var resolver1, resolver2 awstypes.Resolver + var resolver1, resolver2 appsync.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -242,12 +241,12 @@ func testAccResolver_requestTemplate(t *testing.T) { func testAccResolver_responseTemplate(t *testing.T) { ctx := acctest.Context(t) - var resolver1, resolver2 awstypes.Resolver + var resolver1, resolver2 appsync.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -277,12 +276,12 @@ func testAccResolver_responseTemplate(t *testing.T) { func testAccResolver_multipleResolvers(t *testing.T) { ctx := acctest.Context(t) - var resolver awstypes.Resolver + var resolver appsync.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -308,12 +307,12 @@ func testAccResolver_multipleResolvers(t *testing.T) { func testAccResolver_pipeline(t *testing.T) { ctx := acctest.Context(t) - var resolver awstypes.Resolver + var resolver appsync.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -337,12 +336,12 @@ func testAccResolver_pipeline(t *testing.T) { func testAccResolver_caching(t *testing.T) { ctx := acctest.Context(t) - var resolver awstypes.Resolver + var resolver appsync.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -366,7 +365,7 @@ func testAccResolver_caching(t *testing.T) { func testAccCheckResolverDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_resolver" { continue @@ -384,9 +383,9 @@ func testAccCheckResolverDestroy(ctx context.Context) resource.TestCheckFunc { FieldName: aws.String(fieldName), } - _, err = conn.GetResolver(ctx, input) + _, err = conn.GetResolverWithContext(ctx, input) - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { continue } @@ -398,7 +397,7 @@ func testAccCheckResolverDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckResolverExists(ctx context.Context, name string, resolver *awstypes.Resolver) resource.TestCheckFunc { +func testAccCheckResolverExists(ctx context.Context, name string, resolver *appsync.Resolver) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] if !ok { @@ -414,7 +413,7 @@ func testAccCheckResolverExists(ctx context.Context, name string, resolver *awst return err } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) input := &appsync.GetResolverInput{ ApiId: aws.String(apiID), @@ -422,7 +421,7 @@ func testAccCheckResolverExists(ctx context.Context, name string, resolver *awst FieldName: aws.String(fieldName), } - output, err := conn.GetResolver(ctx, input) + output, err := conn.GetResolverWithContext(ctx, input) if err != nil { return err diff --git a/internal/service/appsync/service_endpoints_gen_test.go b/internal/service/appsync/service_endpoints_gen_test.go index 59d891160d1..0b88fc469ac 100644 --- a/internal/service/appsync/service_endpoints_gen_test.go +++ b/internal/service/appsync/service_endpoints_gen_test.go @@ -4,17 +4,17 @@ package appsync_test import ( "context" - "errors" "fmt" "maps" + "net/url" "os" "path/filepath" "reflect" "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appsync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appsync" + "github.com/aws/aws-sdk-go/aws/endpoints" + appsync_sdkv1 "github.com/aws/aws-sdk-go/service/appsync" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -212,42 +212,32 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) string { - r := appsync_sdkv2.NewDefaultEndpointResolverV2() + r := endpoints.DefaultResolver() - ep, err := r.ResolveEndpoint(context.Background(), appsync_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - }) + ep, err := r.EndpointFor(appsync_sdkv1.EndpointsID, region) if err != nil { return err.Error() } - if ep.URI.Path == "" { - ep.URI.Path = "/" + url, _ := url.Parse(ep.URL) + + if url.Path == "" { + url.Path = "/" } - return ep.URI.String() + return url.String() } func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) string { t.Helper() - var endpoint string + client := meta.AppSyncConn(ctx) - client := meta.AppSyncClient(ctx) + req, _ := client.ListDomainNamesRequest(&appsync_sdkv1.ListDomainNamesInput{}) - _, err := client.ListDomainNames(ctx, &appsync_sdkv2.ListDomainNamesInput{}, - func(opts *appsync_sdkv2.Options) { - opts.APIOptions = append(opts.APIOptions, - addRetrieveEndpointURLMiddleware(t, &endpoint), - addCancelRequestMiddleware(), - ) - }, - ) - if err == nil { - t.Fatal("Expected an error, got none") - } else if !errors.Is(err, errCancelOperation) { - t.Fatalf("Unexpected error: %s", err) - } + req.HTTPRequest.URL.Path = "/" + + endpoint := req.HTTPRequest.URL.String() return endpoint } diff --git a/internal/service/appsync/service_package.go b/internal/service/appsync/service_package.go new file mode 100644 index 00000000000..53db884512f --- /dev/null +++ b/internal/service/appsync/service_package.go @@ -0,0 +1,26 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package appsync + +import ( + "context" + + aws_sdkv1 "github.com/aws/aws-sdk-go/aws" + request_sdkv1 "github.com/aws/aws-sdk-go/aws/request" + appsync_sdkv1 "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" +) + +// CustomizeConn customizes a new AWS SDK for Go v1 client for this service package's AWS API. +func (p *servicePackage) CustomizeConn(ctx context.Context, conn *appsync_sdkv1.AppSync) (*appsync_sdkv1.AppSync, error) { + conn.Handlers.Retry.PushBack(func(r *request_sdkv1.Request) { + if r.Operation.Name == "CreateGraphqlApi" { + if tfawserr.ErrMessageContains(r.Error, appsync_sdkv1.ErrCodeConcurrentModificationException, "a GraphQL API creation is already in progress") { + r.Retryable = aws_sdkv1.Bool(true) + } + } + }) + + return conn, nil +} diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index 6704bf86344..47f71305f26 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -5,8 +5,9 @@ package appsync import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appsync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appsync" + aws_sdkv1 "github.com/aws/aws-sdk-go/aws" + session_sdkv1 "github.com/aws/aws-sdk-go/aws/session" + appsync_sdkv1 "github.com/aws/aws-sdk-go/service/appsync" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -76,15 +77,11 @@ func (p *servicePackage) ServicePackageName() string { return names.AppSync } -// NewClient returns a new AWS SDK for Go v2 client for this service package's AWS API. -func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*appsync_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +// NewConn returns a new AWS SDK for Go v1 client for this service package's AWS API. +func (p *servicePackage) NewConn(ctx context.Context, config map[string]any) (*appsync_sdkv1.AppSync, error) { + sess := config["session"].(*session_sdkv1.Session) - return appsync_sdkv2.NewFromConfig(cfg, func(o *appsync_sdkv2.Options) { - if endpoint := config["endpoint"].(string); endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) - } - }), nil + return appsync_sdkv1.New(sess.Copy(&aws_sdkv1.Config{Endpoint: aws_sdkv1.String(config["endpoint"].(string))})), nil } func ServicePackage(ctx context.Context) conns.ServicePackage { diff --git a/internal/service/appsync/status.go b/internal/service/appsync/status.go index c735e4d8544..7b3ecbbd352 100644 --- a/internal/service/appsync/status.go +++ b/internal/service/appsync/status.go @@ -6,12 +6,13 @@ package appsync import ( "context" - "github.com/aws/aws-sdk-go-v2/service/appsync" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) -func StatusAPICache(ctx context.Context, conn *appsync.Client, name string) retry.StateRefreshFunc { +func StatusAPICache(ctx context.Context, conn *appsync.AppSync, name string) retry.StateRefreshFunc { return func() (interface{}, string, error) { output, err := FindAPICacheByID(ctx, conn, name) @@ -23,11 +24,11 @@ func StatusAPICache(ctx context.Context, conn *appsync.Client, name string) retr return nil, "", err } - return output, string(output.Status), nil + return output, aws.StringValue(output.Status), nil } } -func statusDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, id string) retry.StateRefreshFunc { +func statusDomainNameAPIAssociation(ctx context.Context, conn *appsync.AppSync, id string) retry.StateRefreshFunc { return func() (interface{}, string, error) { output, err := FindDomainNameAPIAssociationByID(ctx, conn, id) @@ -39,6 +40,6 @@ func statusDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, i return nil, "", err } - return output, string(output.AssociationStatus), nil + return output, aws.StringValue(output.AssociationStatus), nil } } diff --git a/internal/service/appsync/sweep.go b/internal/service/appsync/sweep.go index 41d57566332..459b5265365 100644 --- a/internal/service/appsync/sweep.go +++ b/internal/service/appsync/sweep.go @@ -7,8 +7,8 @@ import ( "fmt" "log" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/sweep" @@ -41,14 +41,14 @@ func sweepGraphQLAPIs(region string) error { if err != nil { return fmt.Errorf("Error getting client: %s", err) } - conn := client.AppSyncClient(ctx) + conn := client.AppSyncConn(ctx) sweepResources := make([]sweep.Sweepable, 0) var errs *multierror.Error input := &appsync.ListGraphqlApisInput{} for { - output, err := conn.ListGraphqlApis(ctx, input) + output, err := conn.ListGraphqlApisWithContext(ctx, input) if awsv1.SkipSweepError(err) { log.Printf("[WARN] Skipping AppSync GraphQL API sweep for %s: %s", region, err) return nil @@ -65,13 +65,13 @@ func sweepGraphQLAPIs(region string) error { r := ResourceGraphQLAPI() d := r.Data(nil) - id := aws.ToString(graphAPI.ApiId) + id := aws.StringValue(graphAPI.ApiId) d.SetId(id) sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client)) } - if aws.ToString(output.NextToken) == "" { + if aws.StringValue(output.NextToken) == "" { break } @@ -96,14 +96,14 @@ func sweepDomainNames(region string) error { if err != nil { return fmt.Errorf("Error getting client: %s", err) } - conn := client.AppSyncClient(ctx) + conn := client.AppSyncConn(ctx) sweepResources := make([]sweep.Sweepable, 0) var errs *multierror.Error input := &appsync.ListDomainNamesInput{} for { - output, err := conn.ListDomainNames(ctx, input) + output, err := conn.ListDomainNamesWithContext(ctx, input) if awsv1.SkipSweepError(err) { log.Printf("[WARN] Skipping AppSync Domain Name sweep for %s: %s", region, err) return nil @@ -120,13 +120,13 @@ func sweepDomainNames(region string) error { r := ResourceDomainName() d := r.Data(nil) - id := aws.ToString(dm.DomainName) + id := aws.StringValue(dm.DomainName) d.SetId(id) sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client)) } - if aws.ToString(output.NextToken) == "" { + if aws.StringValue(output.NextToken) == "" { break } @@ -151,14 +151,14 @@ func sweepDomainNameAssociations(region string) error { if err != nil { return fmt.Errorf("Error getting client: %s", err) } - conn := client.AppSyncClient(ctx) + conn := client.AppSyncConn(ctx) sweepResources := make([]sweep.Sweepable, 0) var errs *multierror.Error input := &appsync.ListDomainNamesInput{} for { - output, err := conn.ListDomainNames(ctx, input) + output, err := conn.ListDomainNamesWithContext(ctx, input) if awsv1.SkipSweepError(err) { log.Printf("[WARN] Skipping AppSync Domain Name Association sweep for %s: %s", region, err) return nil @@ -175,13 +175,13 @@ func sweepDomainNameAssociations(region string) error { r := ResourceDomainNameAPIAssociation() d := r.Data(nil) - id := aws.ToString(dm.DomainName) + id := aws.StringValue(dm.DomainName) d.SetId(id) sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client)) } - if aws.ToString(output.NextToken) == "" { + if aws.StringValue(output.NextToken) == "" { break } diff --git a/internal/service/appsync/tags_gen.go b/internal/service/appsync/tags_gen.go index cef3f451d5a..bd6eb207346 100644 --- a/internal/service/appsync/tags_gen.go +++ b/internal/service/appsync/tags_gen.go @@ -5,8 +5,9 @@ import ( "context" "fmt" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/aws/aws-sdk-go/service/appsync/appsynciface" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/logging" @@ -18,12 +19,12 @@ import ( // listTags lists appsync service tags. // The identifier is typically the Amazon Resource Name (ARN), although // it may also be a different identifier depending on the service. -func listTags(ctx context.Context, conn *appsync.Client, identifier string, optFns ...func(*appsync.Options)) (tftags.KeyValueTags, error) { +func listTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier string) (tftags.KeyValueTags, error) { input := &appsync.ListTagsForResourceInput{ ResourceArn: aws.String(identifier), } - output, err := conn.ListTagsForResource(ctx, input, optFns...) + output, err := conn.ListTagsForResourceWithContext(ctx, input) if err != nil { return tftags.New(ctx, nil), err @@ -35,7 +36,7 @@ func listTags(ctx context.Context, conn *appsync.Client, identifier string, optF // ListTags lists appsync service tags and set them in Context. // It is called from outside this package. func (p *servicePackage) ListTags(ctx context.Context, meta any, identifier string) error { - tags, err := listTags(ctx, meta.(*conns.AWSClient).AppSyncClient(ctx), identifier) + tags, err := listTags(ctx, meta.(*conns.AWSClient).AppSyncConn(ctx), identifier) if err != nil { return err @@ -48,21 +49,21 @@ func (p *servicePackage) ListTags(ctx context.Context, meta any, identifier stri return nil } -// map[string]string handling +// map[string]*string handling // Tags returns appsync service tags. -func Tags(tags tftags.KeyValueTags) map[string]string { - return tags.Map() +func Tags(tags tftags.KeyValueTags) map[string]*string { + return aws.StringMap(tags.Map()) } // KeyValueTags creates tftags.KeyValueTags from appsync service tags. -func KeyValueTags(ctx context.Context, tags map[string]string) tftags.KeyValueTags { +func KeyValueTags(ctx context.Context, tags map[string]*string) tftags.KeyValueTags { return tftags.New(ctx, tags) } // getTagsIn returns appsync service tags from Context. // nil is returned if there are no input tags. -func getTagsIn(ctx context.Context) map[string]string { +func getTagsIn(ctx context.Context) map[string]*string { if inContext, ok := tftags.FromContext(ctx); ok { if tags := Tags(inContext.TagsIn.UnwrapOrDefault()); len(tags) > 0 { return tags @@ -73,7 +74,7 @@ func getTagsIn(ctx context.Context) map[string]string { } // setTagsOut sets appsync service tags in Context. -func setTagsOut(ctx context.Context, tags map[string]string) { +func setTagsOut(ctx context.Context, tags map[string]*string) { if inContext, ok := tftags.FromContext(ctx); ok { inContext.TagsOut = option.Some(KeyValueTags(ctx, tags)) } @@ -82,7 +83,7 @@ func setTagsOut(ctx context.Context, tags map[string]string) { // updateTags updates appsync service tags. // The identifier is typically the Amazon Resource Name (ARN), although // it may also be a different identifier depending on the service. -func updateTags(ctx context.Context, conn *appsync.Client, identifier string, oldTagsMap, newTagsMap any, optFns ...func(*appsync.Options)) error { +func updateTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier string, oldTagsMap, newTagsMap any) error { oldTags := tftags.New(ctx, oldTagsMap) newTags := tftags.New(ctx, newTagsMap) @@ -93,10 +94,10 @@ func updateTags(ctx context.Context, conn *appsync.Client, identifier string, ol if len(removedTags) > 0 { input := &appsync.UntagResourceInput{ ResourceArn: aws.String(identifier), - TagKeys: removedTags.Keys(), + TagKeys: aws.StringSlice(removedTags.Keys()), } - _, err := conn.UntagResource(ctx, input, optFns...) + _, err := conn.UntagResourceWithContext(ctx, input) if err != nil { return fmt.Errorf("untagging resource (%s): %w", identifier, err) @@ -111,7 +112,7 @@ func updateTags(ctx context.Context, conn *appsync.Client, identifier string, ol Tags: Tags(updatedTags), } - _, err := conn.TagResource(ctx, input, optFns...) + _, err := conn.TagResourceWithContext(ctx, input) if err != nil { return fmt.Errorf("tagging resource (%s): %w", identifier, err) @@ -124,5 +125,5 @@ func updateTags(ctx context.Context, conn *appsync.Client, identifier string, ol // UpdateTags updates appsync service tags. // It is called from outside this package. func (p *servicePackage) UpdateTags(ctx context.Context, meta any, identifier string, oldTags, newTags any) error { - return updateTags(ctx, meta.(*conns.AWSClient).AppSyncClient(ctx), identifier, oldTags, newTags) + return updateTags(ctx, meta.(*conns.AWSClient).AppSyncConn(ctx), identifier, oldTags, newTags) } diff --git a/internal/service/appsync/type.go b/internal/service/appsync/type.go index f73c3877263..84b817a3b1b 100644 --- a/internal/service/appsync/type.go +++ b/internal/service/appsync/type.go @@ -9,14 +9,13 @@ import ( "log" "strings" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/appsync" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/appsync" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/enum" - "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) @@ -51,9 +50,9 @@ func ResourceType() *schema.Resource { Required: true, }, "format": { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.TypeDefinitionFormat](), + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringInSlice(appsync.TypeDefinitionFormat_Values(), false), }, "name": { Type: schema.TypeString, @@ -65,29 +64,29 @@ func ResourceType() *schema.Resource { func resourceTypeCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID := d.Get("api_id").(string) params := &appsync.CreateTypeInput{ ApiId: aws.String(apiID), Definition: aws.String(d.Get("definition").(string)), - Format: awstypes.TypeDefinitionFormat(d.Get("format").(string)), + Format: aws.String(d.Get("format").(string)), } - out, err := conn.CreateType(ctx, params) + out, err := conn.CreateTypeWithContext(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync Type: %s", err) } - d.SetId(fmt.Sprintf("%s:%s:%s", apiID, string(out.Type.Format), aws.ToString(out.Type.Name))) + d.SetId(fmt.Sprintf("%s:%s:%s", apiID, aws.StringValue(out.Type.Format), aws.StringValue(out.Type.Name))) return append(diags, resourceTypeRead(ctx, d, meta)...) } func resourceTypeRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) apiID, format, name, err := DecodeTypeID(d.Id()) if err != nil { @@ -117,16 +116,16 @@ func resourceTypeRead(ctx context.Context, d *schema.ResourceData, meta interfac func resourceTypeUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) params := &appsync.UpdateTypeInput{ ApiId: aws.String(d.Get("api_id").(string)), - Format: awstypes.TypeDefinitionFormat(d.Get("format").(string)), + Format: aws.String(d.Get("format").(string)), TypeName: aws.String(d.Get("name").(string)), Definition: aws.String(d.Get("definition").(string)), } - _, err := conn.UpdateType(ctx, params) + _, err := conn.UpdateTypeWithContext(ctx, params) if err != nil { return sdkdiag.AppendErrorf(diags, "updating Appsync Type %q: %s", d.Id(), err) } @@ -136,15 +135,15 @@ func resourceTypeUpdate(ctx context.Context, d *schema.ResourceData, meta interf func resourceTypeDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + conn := meta.(*conns.AWSClient).AppSyncConn(ctx) input := &appsync.DeleteTypeInput{ ApiId: aws.String(d.Get("api_id").(string)), TypeName: aws.String(d.Get("name").(string)), } - _, err := conn.DeleteType(ctx, input) + _, err := conn.DeleteTypeWithContext(ctx, input) if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { + if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { return diags } return sdkdiag.AppendErrorf(diags, "deleting Appsync Type: %s", err) diff --git a/internal/service/appsync/type_test.go b/internal/service/appsync/type_test.go index ae624999acb..71e25a63b3c 100644 --- a/internal/service/appsync/type_test.go +++ b/internal/service/appsync/type_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/YakDriver/regexache" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/service/appsync" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -22,12 +22,12 @@ import ( func testAccType_basic(t *testing.T) { ctx := acctest.Context(t) - var typ awstypes.Type + var typ appsync.Type resourceName := "aws_appsync_type.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckTypeDestroy(ctx), @@ -53,12 +53,12 @@ func testAccType_basic(t *testing.T) { func testAccType_disappears(t *testing.T) { ctx := acctest.Context(t) - var typ awstypes.Type + var typ appsync.Type resourceName := "aws_appsync_type.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckTypeDestroy(ctx), @@ -77,7 +77,7 @@ func testAccType_disappears(t *testing.T) { func testAccCheckTypeDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_type" { @@ -103,7 +103,7 @@ func testAccCheckTypeDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckTypeExists(ctx context.Context, resourceName string, typ *awstypes.Type) resource.TestCheckFunc { +func testAccCheckTypeExists(ctx context.Context, resourceName string, typ *appsync.Type) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] if !ok { @@ -115,7 +115,7 @@ func testAccCheckTypeExists(ctx context.Context, resourceName string, typ *awsty return err } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) out, err := tfappsync.FindTypeByThreePartKey(ctx, conn, apiID, format, name) if err != nil { return err diff --git a/internal/service/appsync/wait.go b/internal/service/appsync/wait.go index 1449b2c725f..59bd7cb9c48 100644 --- a/internal/service/appsync/wait.go +++ b/internal/service/appsync/wait.go @@ -7,10 +7,8 @@ import ( "context" "time" - "github.com/aws/aws-sdk-go-v2/service/appsync" - awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/aws/aws-sdk-go/service/appsync" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/hashicorp/terraform-provider-aws/internal/enum" ) const ( @@ -20,10 +18,10 @@ const ( domainNameAPIDisassociationTimeout = 60 * time.Minute ) -func waitAPICacheAvailable(ctx context.Context, conn *appsync.Client, id string) error { +func waitAPICacheAvailable(ctx context.Context, conn *appsync.AppSync, id string) error { stateConf := &retry.StateChangeConf{ - Pending: enum.Slice(awstypes.ApiCacheStatusCreating, awstypes.ApiCacheStatusModifying), - Target: enum.Slice(awstypes.ApiCacheStatusAvailable), + Pending: []string{appsync.ApiCacheStatusCreating, appsync.ApiCacheStatusModifying}, + Target: []string{appsync.ApiCacheStatusAvailable}, Refresh: StatusAPICache(ctx, conn, id), Timeout: apiCacheAvailableTimeout, } @@ -33,9 +31,9 @@ func waitAPICacheAvailable(ctx context.Context, conn *appsync.Client, id string) return err } -func waitAPICacheDeleted(ctx context.Context, conn *appsync.Client, id string) error { +func waitAPICacheDeleted(ctx context.Context, conn *appsync.AppSync, id string) error { stateConf := &retry.StateChangeConf{ - Pending: enum.Slice(awstypes.ApiCacheStatusDeleting), + Pending: []string{appsync.ApiCacheStatusDeleting}, Target: []string{}, Refresh: StatusAPICache(ctx, conn, id), Timeout: apiCacheDeletedTimeout, @@ -46,10 +44,10 @@ func waitAPICacheDeleted(ctx context.Context, conn *appsync.Client, id string) e return err } -func waitDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, id string) error { +func waitDomainNameAPIAssociation(ctx context.Context, conn *appsync.AppSync, id string) error { stateConf := &retry.StateChangeConf{ - Pending: enum.Slice(awstypes.AssociationStatusProcessing), - Target: enum.Slice(awstypes.AssociationStatusSuccess), + Pending: []string{appsync.AssociationStatusProcessing}, + Target: []string{appsync.AssociationStatusSuccess}, Refresh: statusDomainNameAPIAssociation(ctx, conn, id), Timeout: domainNameAPIAssociationTimeout, } @@ -59,9 +57,9 @@ func waitDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, id return err } -func waitDomainNameAPIDisassociation(ctx context.Context, conn *appsync.Client, id string) error { +func waitDomainNameAPIDisassociation(ctx context.Context, conn *appsync.AppSync, id string) error { stateConf := &retry.StateChangeConf{ - Pending: enum.Slice(awstypes.AssociationStatusProcessing), + Pending: []string{appsync.AssociationStatusProcessing}, Target: []string{}, Refresh: statusDomainNameAPIAssociation(ctx, conn, id), Timeout: domainNameAPIDisassociationTimeout, diff --git a/names/data/names_data.csv b/names/data/names_data.csv index 48dc2fc2ce2..2fb03065013 100644 --- a/names/data/names_data.csv +++ b/names/data/names_data.csv @@ -25,7 +25,7 @@ applicationcostprofiler,applicationcostprofiler,applicationcostprofiler,applicat discovery,discovery,applicationdiscoveryservice,applicationdiscoveryservice,,discovery,,applicationdiscovery;applicationdiscoveryservice,Discovery,ApplicationDiscoveryService,,1,,,aws_discovery_,,discovery_,Application Discovery,AWS,,x,,,,,Application Discovery Service,,, mgn,mgn,mgn,mgn,,mgn,,,Mgn,Mgn,,1,,,aws_mgn_,,mgn_,Application Migration (Mgn),AWS,,x,,,,,mgn,,, appstream,appstream,appstream,appstream,,appstream,,,AppStream,AppStream,,1,,,aws_appstream_,,appstream_,AppStream 2.0,Amazon,,,,,,,AppStream,ListAssociatedFleets,, -appsync,appsync,appsync,appsync,,appsync,,,AppSync,AppSync,,,2,,aws_appsync_,,appsync_,AppSync,AWS,,,,,,,AppSync,ListDomainNames,, +appsync,appsync,appsync,appsync,,appsync,,,AppSync,AppSync,,1,,,aws_appsync_,,appsync_,AppSync,AWS,,,,,,,AppSync,ListDomainNames,, ,,,,,,,,,,,,,,,,,Artifact,AWS,x,,,,,,,,,No SDK support athena,athena,athena,athena,,athena,,,Athena,Athena,,,2,,aws_athena_,,athena_,Athena,Amazon,,,,,,,Athena,ListDataCatalogs,, auditmanager,auditmanager,auditmanager,auditmanager,,auditmanager,,,AuditManager,AuditManager,,,2,,aws_auditmanager_,,auditmanager_,Audit Manager,AWS,,,,,,,AuditManager,GetAccountStatus,, diff --git a/names/names.go b/names/names.go index 2a0e9c54866..4b67e7c95b2 100644 --- a/names/names.go +++ b/names/names.go @@ -27,7 +27,6 @@ import ( const ( AccessAnalyzerEndpointID = "access-analyzer" AMPEndpointID = "aps" - AppSyncEndpointID = "appsync" AthenaEndpointID = "athena" AuditManagerEndpointID = "auditmanager" BatchEndpointID = "batch" From c8f760f341bc2af4e5c69753f69ab7709ff160e5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 19 Jun 2024 10:46:29 -0400 Subject: [PATCH 003/208] appsync: Use AWS SDK for Go v2. --- internal/service/appsync/generate.go | 2 +- names/data/names_data.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/appsync/generate.go b/internal/service/appsync/generate.go index 3efb706569b..93bd9782d71 100644 --- a/internal/service/appsync/generate.go +++ b/internal/service/appsync/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 -ListTags -ServiceTagsMap -UpdateTags -KVTValues -SkipTypesImp //go:generate go run ../../generate/servicepackage/main.go // ONLY generate directives and package declaration! Do not add anything else to this file. diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl index 5794d5bc72f..0daea914f82 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -667,7 +667,7 @@ service "appsync" { sdk { id = "AppSync" - client_version = [1] + client_version = [2] } names { From 89641e74985a121b25e4c470c3c2e526865b43be Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 19 Jun 2024 10:47:57 -0400 Subject: [PATCH 004/208] Run 'make gen'. --- internal/conns/awsclient_gen.go | 6 +- .../appsync/service_endpoints_gen_test.go | 147 ++++++++++++++---- .../service/appsync/service_package_gen.go | 36 ++--- internal/service/appsync/tags_gen.go | 33 ++-- 4 files changed, 156 insertions(+), 66 deletions(-) diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go index aaed1ad1497..d113fb05f54 100644 --- a/internal/conns/awsclient_gen.go +++ b/internal/conns/awsclient_gen.go @@ -20,6 +20,7 @@ import ( applicationinsights_sdkv2 "github.com/aws/aws-sdk-go-v2/service/applicationinsights" apprunner_sdkv2 "github.com/aws/aws-sdk-go-v2/service/apprunner" appstream_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appstream" + appsync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appsync" athena_sdkv2 "github.com/aws/aws-sdk-go-v2/service/athena" auditmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/auditmanager" autoscaling_sdkv2 "github.com/aws/aws-sdk-go-v2/service/autoscaling" @@ -186,7 +187,6 @@ import ( workspacesweb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/workspacesweb" xray_sdkv2 "github.com/aws/aws-sdk-go-v2/service/xray" appmesh_sdkv1 "github.com/aws/aws-sdk-go/service/appmesh" - appsync_sdkv1 "github.com/aws/aws-sdk-go/service/appsync" batch_sdkv1 "github.com/aws/aws-sdk-go/service/batch" chime_sdkv1 "github.com/aws/aws-sdk-go/service/chime" cognitoidentityprovider_sdkv1 "github.com/aws/aws-sdk-go/service/cognitoidentityprovider" @@ -319,8 +319,8 @@ func (c *AWSClient) AppStreamClient(ctx context.Context) *appstream_sdkv2.Client return errs.Must(client[*appstream_sdkv2.Client](ctx, c, names.AppStream, make(map[string]any))) } -func (c *AWSClient) AppSyncConn(ctx context.Context) *appsync_sdkv1.AppSync { - return errs.Must(conn[*appsync_sdkv1.AppSync](ctx, c, names.AppSync, make(map[string]any))) +func (c *AWSClient) AppSyncClient(ctx context.Context) *appsync_sdkv2.Client { + return errs.Must(client[*appsync_sdkv2.Client](ctx, c, names.AppSync, make(map[string]any))) } func (c *AWSClient) ApplicationInsightsClient(ctx context.Context) *applicationinsights_sdkv2.Client { diff --git a/internal/service/appsync/service_endpoints_gen_test.go b/internal/service/appsync/service_endpoints_gen_test.go index 406c5adcc19..8e45a42f223 100644 --- a/internal/service/appsync/service_endpoints_gen_test.go +++ b/internal/service/appsync/service_endpoints_gen_test.go @@ -4,17 +4,20 @@ package appsync_test import ( "context" + "errors" "fmt" "maps" - "net/url" "os" "path/filepath" + "reflect" "strings" "testing" - aws_sdkv1 "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/endpoints" - appsync_sdkv1 "github.com/aws/aws-sdk-go/service/appsync" + aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + appsync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appsync" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" "github.com/hashicorp/aws-sdk-go-base/v2/servicemocks" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" @@ -239,54 +242,63 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) string { - r := endpoints.DefaultResolver() + r := appsync_sdkv2.NewDefaultEndpointResolverV2() - ep, err := r.EndpointFor(appsync_sdkv1.EndpointsID, region) + ep, err := r.ResolveEndpoint(context.Background(), appsync_sdkv2.EndpointParameters{ + Region: aws_sdkv2.String(region), + }) if err != nil { return err.Error() } - url, _ := url.Parse(ep.URL) - - if url.Path == "" { - url.Path = "/" + if ep.URI.Path == "" { + ep.URI.Path = "/" } - return url.String() + return ep.URI.String() } func defaultFIPSEndpoint(region string) string { - r := endpoints.DefaultResolver() + r := appsync_sdkv2.NewDefaultEndpointResolverV2() - ep, err := r.EndpointFor(appsync_sdkv1.EndpointsID, region, func(opt *endpoints.Options) { - opt.UseFIPSEndpoint = endpoints.FIPSEndpointStateEnabled + ep, err := r.ResolveEndpoint(context.Background(), appsync_sdkv2.EndpointParameters{ + Region: aws_sdkv2.String(region), + UseFIPS: aws_sdkv2.Bool(true), }) if err != nil { return err.Error() } - url, _ := url.Parse(ep.URL) - - if url.Path == "" { - url.Path = "/" + if ep.URI.Path == "" { + ep.URI.Path = "/" } - return url.String() + return ep.URI.String() } func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams { t.Helper() - client := meta.AppSyncConn(ctx) + client := meta.AppSyncClient(ctx) - req, _ := client.ListDomainNamesRequest(&appsync_sdkv1.ListDomainNamesInput{}) + var result apiCallParams - req.HTTPRequest.URL.Path = "/" - - return apiCallParams{ - endpoint: req.HTTPRequest.URL.String(), - region: aws_sdkv1.StringValue(client.Config.Region), + _, err := client.ListDomainNames(ctx, &appsync_sdkv2.ListDomainNamesInput{}, + func(opts *appsync_sdkv2.Options) { + opts.APIOptions = append(opts.APIOptions, + addRetrieveEndpointURLMiddleware(t, &result.endpoint), + addRetrieveRegionMiddleware(&result.region), + addCancelRequestMiddleware(), + ) + }, + ) + if err == nil { + t.Fatal("Expected an error, got none") + } else if !errors.Is(err, errCancelOperation) { + t.Fatalf("Unexpected error: %s", err) } + + return result } func withNoConfig(_ *caseSetup) { @@ -443,6 +455,89 @@ func testEndpointCase(t *testing.T, region string, testcase endpointTestCase, ca } } +func addRetrieveEndpointURLMiddleware(t *testing.T, endpoint *string) func(*middleware.Stack) error { + return func(stack *middleware.Stack) error { + return stack.Finalize.Add( + retrieveEndpointURLMiddleware(t, endpoint), + middleware.After, + ) + } +} + +func retrieveEndpointURLMiddleware(t *testing.T, endpoint *string) middleware.FinalizeMiddleware { + return middleware.FinalizeMiddlewareFunc( + "Test: Retrieve Endpoint", + func(ctx context.Context, in middleware.FinalizeInput, next middleware.FinalizeHandler) (middleware.FinalizeOutput, middleware.Metadata, error) { + t.Helper() + + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + t.Fatalf("Expected *github.com/aws/smithy-go/transport/http.Request, got %s", fullTypeName(in.Request)) + } + + url := request.URL + url.RawQuery = "" + url.Path = "/" + + *endpoint = url.String() + + return next.HandleFinalize(ctx, in) + }) +} + +func addRetrieveRegionMiddleware(region *string) func(*middleware.Stack) error { + return func(stack *middleware.Stack) error { + return stack.Serialize.Add( + retrieveRegionMiddleware(region), + middleware.After, + ) + } +} + +func retrieveRegionMiddleware(region *string) middleware.SerializeMiddleware { + return middleware.SerializeMiddlewareFunc( + "Test: Retrieve Region", + func(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (middleware.SerializeOutput, middleware.Metadata, error) { + *region = awsmiddleware.GetRegion(ctx) + + return next.HandleSerialize(ctx, in) + }, + ) +} + +var errCancelOperation = fmt.Errorf("Test: Canceling request") + +func addCancelRequestMiddleware() func(*middleware.Stack) error { + return func(stack *middleware.Stack) error { + return stack.Finalize.Add( + cancelRequestMiddleware(), + middleware.After, + ) + } +} + +// cancelRequestMiddleware creates a Smithy middleware that intercepts the request before sending and cancels it +func cancelRequestMiddleware() middleware.FinalizeMiddleware { + return middleware.FinalizeMiddlewareFunc( + "Test: Cancel Requests", + func(_ context.Context, in middleware.FinalizeInput, next middleware.FinalizeHandler) (middleware.FinalizeOutput, middleware.Metadata, error) { + return middleware.FinalizeOutput{}, middleware.Metadata{}, errCancelOperation + }) +} + +func fullTypeName(i interface{}) string { + return fullValueTypeName(reflect.ValueOf(i)) +} + +func fullValueTypeName(v reflect.Value) string { + if v.Kind() == reflect.Ptr { + return "*" + fullValueTypeName(reflect.Indirect(v)) + } + + requestType := v.Type() + return fmt.Sprintf("%s.%s", requestType.PkgPath(), requestType.Name()) +} + func generateSharedConfigFile(config configFile) string { var buf strings.Builder diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index 5707ebda9dc..ccff38acc5f 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -5,10 +5,8 @@ package appsync import ( "context" - aws_sdkv1 "github.com/aws/aws-sdk-go/aws" - endpoints_sdkv1 "github.com/aws/aws-sdk-go/aws/endpoints" - session_sdkv1 "github.com/aws/aws-sdk-go/aws/session" - appsync_sdkv1 "github.com/aws/aws-sdk-go/service/appsync" + aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + appsync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appsync" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" @@ -79,25 +77,23 @@ func (p *servicePackage) ServicePackageName() string { return names.AppSync } -// NewConn returns a new AWS SDK for Go v1 client for this service package's AWS API. -func (p *servicePackage) NewConn(ctx context.Context, config map[string]any) (*appsync_sdkv1.AppSync, error) { - sess := config[names.AttrSession].(*session_sdkv1.Session) +// NewClient returns a new AWS SDK for Go v2 client for this service package's AWS API. +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*appsync_sdkv2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) - cfg := aws_sdkv1.Config{} + return appsync_sdkv2.NewFromConfig(cfg, func(o *appsync_sdkv2.Options) { + if endpoint := config[names.AttrEndpoint].(string); endpoint != "" { + tflog.Debug(ctx, "setting endpoint", map[string]any{ + "tf_aws.endpoint": endpoint, + }) + o.BaseEndpoint = aws_sdkv2.String(endpoint) - if endpoint := config[names.AttrEndpoint].(string); endpoint != "" { - tflog.Debug(ctx, "setting endpoint", map[string]any{ - "tf_aws.endpoint": endpoint, - }) - cfg.Endpoint = aws_sdkv1.String(endpoint) - - if sess.Config.UseFIPSEndpoint == endpoints_sdkv1.FIPSEndpointStateEnabled { - tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - cfg.UseFIPSEndpoint = endpoints_sdkv1.FIPSEndpointStateDisabled + if o.EndpointOptions.UseFIPSEndpoint == aws_sdkv2.FIPSEndpointStateEnabled { + tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") + o.EndpointOptions.UseFIPSEndpoint = aws_sdkv2.FIPSEndpointStateDisabled + } } - } - - return appsync_sdkv1.New(sess.Copy(&cfg)), nil + }), nil } func ServicePackage(ctx context.Context) conns.ServicePackage { diff --git a/internal/service/appsync/tags_gen.go b/internal/service/appsync/tags_gen.go index bd6eb207346..cef3f451d5a 100644 --- a/internal/service/appsync/tags_gen.go +++ b/internal/service/appsync/tags_gen.go @@ -5,9 +5,8 @@ import ( "context" "fmt" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/aws/aws-sdk-go/service/appsync/appsynciface" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/logging" @@ -19,12 +18,12 @@ import ( // listTags lists appsync service tags. // The identifier is typically the Amazon Resource Name (ARN), although // it may also be a different identifier depending on the service. -func listTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier string) (tftags.KeyValueTags, error) { +func listTags(ctx context.Context, conn *appsync.Client, identifier string, optFns ...func(*appsync.Options)) (tftags.KeyValueTags, error) { input := &appsync.ListTagsForResourceInput{ ResourceArn: aws.String(identifier), } - output, err := conn.ListTagsForResourceWithContext(ctx, input) + output, err := conn.ListTagsForResource(ctx, input, optFns...) if err != nil { return tftags.New(ctx, nil), err @@ -36,7 +35,7 @@ func listTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier stri // ListTags lists appsync service tags and set them in Context. // It is called from outside this package. func (p *servicePackage) ListTags(ctx context.Context, meta any, identifier string) error { - tags, err := listTags(ctx, meta.(*conns.AWSClient).AppSyncConn(ctx), identifier) + tags, err := listTags(ctx, meta.(*conns.AWSClient).AppSyncClient(ctx), identifier) if err != nil { return err @@ -49,21 +48,21 @@ func (p *servicePackage) ListTags(ctx context.Context, meta any, identifier stri return nil } -// map[string]*string handling +// map[string]string handling // Tags returns appsync service tags. -func Tags(tags tftags.KeyValueTags) map[string]*string { - return aws.StringMap(tags.Map()) +func Tags(tags tftags.KeyValueTags) map[string]string { + return tags.Map() } // KeyValueTags creates tftags.KeyValueTags from appsync service tags. -func KeyValueTags(ctx context.Context, tags map[string]*string) tftags.KeyValueTags { +func KeyValueTags(ctx context.Context, tags map[string]string) tftags.KeyValueTags { return tftags.New(ctx, tags) } // getTagsIn returns appsync service tags from Context. // nil is returned if there are no input tags. -func getTagsIn(ctx context.Context) map[string]*string { +func getTagsIn(ctx context.Context) map[string]string { if inContext, ok := tftags.FromContext(ctx); ok { if tags := Tags(inContext.TagsIn.UnwrapOrDefault()); len(tags) > 0 { return tags @@ -74,7 +73,7 @@ func getTagsIn(ctx context.Context) map[string]*string { } // setTagsOut sets appsync service tags in Context. -func setTagsOut(ctx context.Context, tags map[string]*string) { +func setTagsOut(ctx context.Context, tags map[string]string) { if inContext, ok := tftags.FromContext(ctx); ok { inContext.TagsOut = option.Some(KeyValueTags(ctx, tags)) } @@ -83,7 +82,7 @@ func setTagsOut(ctx context.Context, tags map[string]*string) { // updateTags updates appsync service tags. // The identifier is typically the Amazon Resource Name (ARN), although // it may also be a different identifier depending on the service. -func updateTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier string, oldTagsMap, newTagsMap any) error { +func updateTags(ctx context.Context, conn *appsync.Client, identifier string, oldTagsMap, newTagsMap any, optFns ...func(*appsync.Options)) error { oldTags := tftags.New(ctx, oldTagsMap) newTags := tftags.New(ctx, newTagsMap) @@ -94,10 +93,10 @@ func updateTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier st if len(removedTags) > 0 { input := &appsync.UntagResourceInput{ ResourceArn: aws.String(identifier), - TagKeys: aws.StringSlice(removedTags.Keys()), + TagKeys: removedTags.Keys(), } - _, err := conn.UntagResourceWithContext(ctx, input) + _, err := conn.UntagResource(ctx, input, optFns...) if err != nil { return fmt.Errorf("untagging resource (%s): %w", identifier, err) @@ -112,7 +111,7 @@ func updateTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier st Tags: Tags(updatedTags), } - _, err := conn.TagResourceWithContext(ctx, input) + _, err := conn.TagResource(ctx, input, optFns...) if err != nil { return fmt.Errorf("tagging resource (%s): %w", identifier, err) @@ -125,5 +124,5 @@ func updateTags(ctx context.Context, conn appsynciface.AppSyncAPI, identifier st // UpdateTags updates appsync service tags. // It is called from outside this package. func (p *servicePackage) UpdateTags(ctx context.Context, meta any, identifier string, oldTags, newTags any) error { - return updateTags(ctx, meta.(*conns.AWSClient).AppSyncConn(ctx), identifier, oldTags, newTags) + return updateTags(ctx, meta.(*conns.AWSClient).AppSyncClient(ctx), identifier, oldTags, newTags) } From bacee0257042d2a197ddb47dda07cf4b014b0c32 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 19 Jun 2024 10:49:50 -0400 Subject: [PATCH 005/208] Run 'go get github.com/aws/aws-sdk-go-v2/service/appsync@v1.32.6 && go mod tidy'. --- go.mod | 1 + go.sum | 2 ++ 2 files changed, 3 insertions(+) diff --git a/go.mod b/go.mod index 1693b55e486..91b6ded702b 100644 --- a/go.mod +++ b/go.mod @@ -28,6 +28,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.24.10 github.com/aws/aws-sdk-go-v2/service/apprunner v1.28.10 github.com/aws/aws-sdk-go-v2/service/appstream v1.34.10 + github.com/aws/aws-sdk-go-v2/service/appsync v1.32.6 github.com/aws/aws-sdk-go-v2/service/athena v1.41.2 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.33.0 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.11 diff --git a/go.sum b/go.sum index fe9d5583f7d..b103fd47fb9 100644 --- a/go.sum +++ b/go.sum @@ -76,6 +76,8 @@ github.com/aws/aws-sdk-go-v2/service/apprunner v1.28.10 h1:wGqe+j9Ab0kSbrSTI0AlL github.com/aws/aws-sdk-go-v2/service/apprunner v1.28.10/go.mod h1:QqiGYjaeD3O+DGHeij4FZgMEW+pzqJUCQBbcseLQeJU= github.com/aws/aws-sdk-go-v2/service/appstream v1.34.10 h1:JhIT4EGxtjpmIC9l9iLWGw0j8FZezbsqADa6XwkD870= github.com/aws/aws-sdk-go-v2/service/appstream v1.34.10/go.mod h1:stS2ZSwmXOl+IeWEQWFyo8++JVSuKwuJpMF+EJTNLco= +github.com/aws/aws-sdk-go-v2/service/appsync v1.32.6 h1:NpYI3jD+lNccj6p3Z0KAg4shkJ8Fm/FzoGpGu7F9Cec= +github.com/aws/aws-sdk-go-v2/service/appsync v1.32.6/go.mod h1:ei/UCaAT77LNarOeTetVxb1rlZiYBwX0IMdQuf/14x8= github.com/aws/aws-sdk-go-v2/service/athena v1.41.2 h1:PiTlzkJrnYGHucoQQ8zDvgf/vKDgDps2FVr3GIWIWdE= github.com/aws/aws-sdk-go-v2/service/athena v1.41.2/go.mod h1:XCkSMZRqquO7222ELibKBj+bDjg9QeS2wkVKcW7z2Mk= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.33.0 h1:vrvI5gUkDC9s2ogMPTgpLaAca3V49TMi5JkopstiOkA= From 90e43408bae569c360010c2a3e1087844fc9d6f1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 19 Jun 2024 11:17:03 -0400 Subject: [PATCH 006/208] Add 'names.AppSyncEndpointID'. --- names/names.go | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/names/names.go b/names/names.go index 8d2aab5841f..5bb09f15a1e 100644 --- a/names/names.go +++ b/names/names.go @@ -26,88 +26,89 @@ import ( // Endpoint constants defined by the AWS SDK v1 but not defined in the AWS SDK v2. const ( - AccessAnalyzerEndpointID = "access-analyzer" ACMPCAEndpointID = "acm-pca" AMPEndpointID = "aps" - AppStreamEndpointID = "appstream2" - ApplicationAutoscalingEndpointID = "application-autoscaling" - AppFabricEndpointID = "appfabric" - AppIntegrationsEndpointID = "app-integrations" - AppConfigEndpointID = "appconfig" - AmplifyEndpointID = "amplify" APIGatewayID = "apigateway" APIGatewayV2EndpointID = "apigateway" + AccessAnalyzerEndpointID = "access-analyzer" + AmplifyEndpointID = "amplify" + AppConfigEndpointID = "appconfig" + AppFabricEndpointID = "appfabric" + AppIntegrationsEndpointID = "app-integrations" + AppStreamEndpointID = "appstream2" + AppSyncEndpointID = "appsync" + ApplicationAutoscalingEndpointID = "application-autoscaling" ApplicationInsightsEndpointID = "applicationinsights" AthenaEndpointID = "athena" AuditManagerEndpointID = "auditmanager" AutoScalingPlansEndpointID = "autoscaling-plans" + BCMDataExportsEndpointID = "bcm-data-exports" BackupEndpointID = "backup" BatchEndpointID = "batch" BedrockAgentEndpointID = "bedrockagent" BedrockEndpointID = "bedrock" - BCMDataExportsEndpointID = "bcm-data-exports" BudgetsEndpointID = "budgets" ChimeSDKMediaPipelinesEndpointID = "media-pipelines-chime" ChimeSDKVoiceEndpointID = "voice-chime" + Cloud9EndpointID = "cloud9" CloudFormationEndpointID = "cloudformation" CloudFrontEndpointID = "cloudfront" CloudSearchEndpointID = "cloudsearch" CloudWatchEndpointID = "monitoring" - Cloud9EndpointID = "cloud9" CodeArtifactEndpointID = "codeartifact" CodeGuruReviewerEndpointID = "codeguru-reviewer" CodeStarConnectionsEndpointID = "codestar-connections" CognitoIdentityEndpointID = "cognito-identity" ComprehendEndpointID = "comprehend" ConfigServiceEndpointID = "config" - DeviceFarmEndpointID = "devicefarm" - DevOpsGuruEndpointID = "devops-guru" DLMEndpointID = "dlm" + DevOpsGuruEndpointID = "devops-guru" + DeviceFarmEndpointID = "devicefarm" ECREndpointID = "api.ecr" EKSEndpointID = "eks" EMREndpointID = "elasticmapreduce" EventsEndpointID = "events" EvidentlyEndpointID = "evidently" FMSEndpointID = "fms" + IVSChatEndpointID = "ivschat" IdentityStoreEndpointID = "identitystore" Inspector2EndpointID = "inspector2" - IVSChatEndpointID = "ivschat" - KendraEndpointID = "kendra" KMSEndpointID = "kms" + KendraEndpointID = "kendra" LambdaEndpointID = "lambda" LexV2ModelsEndpointID = "models-v2-lex" M2EndpointID = "m2" + MQEndpointID = "mq" MediaConvertEndpointID = "mediaconvert" MediaLiveEndpointID = "medialive" - MQEndpointID = "mq" ObservabilityAccessManagerEndpointID = "oam" - OpenSearchServerlessEndpointID = "aoss" OpenSearchIngestionEndpointID = "osis" + OpenSearchServerlessEndpointID = "aoss" PaymentCryptographyEndpointID = "paymentcryptography" PipesEndpointID = "pipes" PollyEndpointID = "polly" QLDBEndpointID = "qldb" - RedshiftServerlessEndpointID = "redshift-serverless" + RUMEndpointID = "rum" RedshiftEndpointID = "redshift" + RedshiftServerlessEndpointID = "redshift-serverless" RekognitionEndpointID = "rekognition" ResourceExplorer2EndpointID = "resource-explorer-2" RolesAnywhereEndpointID = "rolesanywhere" Route53DomainsEndpointID = "route53domains" - RUMEndpointID = "rum" - SchemasEndpointID = "schemas" + SSMEndpointID = "ssm" + SSMIncidentsEndpointID = "ssm-incidents" + SSOAdminEndpointID = "sso" + STSEndpointID = "sts" SchedulerEndpointID = "scheduler" + SchemasEndpointID = "schemas" ServiceCatalogAppRegistryEndpointID = "servicecatalog-appregistry" ServiceDiscoveryEndpointID = "servicediscovery" ServiceQuotasEndpointID = "servicequotas" ShieldEndpointID = "shield" - SSMEndpointID = "ssm" - SSMIncidentsEndpointID = "ssm-incidents" - SSOAdminEndpointID = "sso" - STSEndpointID = "sts" TranscribeEndpointID = "transcribe" TransferEndpointID = "transfer" - VerifiedPermissionsEndpointID = "verifiedpermissions" VPCLatticeEndpointID = "vpc-lattice" + VerifiedPermissionsEndpointID = "verifiedpermissions" WAFEndpointID = "waf" WAFRegionalEndpointID = "waf-regional" ) From 6a7b1bfd035aa4b16c8112a4dc8a3ed8c1ac5023 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 19 Jun 2024 11:19:31 -0400 Subject: [PATCH 007/208] r/aws_appsync_api_cache: Migrate to AWS SDK for Go v2. --- internal/service/appsync/api_cache.go | 205 +++++++++++++----- internal/service/appsync/api_cache_test.go | 40 ++-- internal/service/appsync/exports_test.go | 11 + internal/service/appsync/find.go | 24 -- .../service/appsync/service_package_gen.go | 3 +- internal/service/appsync/status.go | 16 -- internal/service/appsync/wait.go | 28 --- 7 files changed, 183 insertions(+), 144 deletions(-) create mode 100644 internal/service/appsync/exports_test.go diff --git a/internal/service/appsync/api_cache.go b/internal/service/appsync/api_cache.go index 188e409268a..88c3e04dd34 100644 --- a/internal/service/appsync/api_cache.go +++ b/internal/service/appsync/api_cache.go @@ -6,47 +6,42 @@ package appsync import ( "context" "log" + "time" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) -// @SDKResource("aws_appsync_api_cache") -func ResourceAPICache() *schema.Resource { +// @SDKResource("aws_appsync_api_cache", name="API Cache") +func resourceAPICache() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceAPICacheCreate, ReadWithoutTimeout: resourceAPICacheRead, UpdateWithoutTimeout: resourceAPICacheUpdate, DeleteWithoutTimeout: resourceAPICacheDelete, + Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, Schema: map[string]*schema.Schema{ - "api_id": { - Type: schema.TypeString, - Required: true, - }, "api_caching_behavior": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.ApiCachingBehavior_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.ApiCachingBehavior](), }, - names.AttrType: { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.ApiCacheType_Values(), false), - }, - "ttl": { - Type: schema.TypeInt, + "api_id": { + Type: schema.TypeString, Required: true, }, "at_rest_encryption_enabled": { @@ -59,40 +54,49 @@ func ResourceAPICache() *schema.Resource { Optional: true, ForceNew: true, }, + "ttl": { + Type: schema.TypeInt, + Required: true, + }, + names.AttrType: { + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.ApiCacheType](), + }, }, } } func resourceAPICacheCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID := d.Get("api_id").(string) - - params := &appsync.CreateApiCacheInput{ + input := &appsync.CreateApiCacheInput{ + ApiCachingBehavior: awstypes.ApiCachingBehavior(d.Get("api_caching_behavior").(string)), ApiId: aws.String(apiID), - Type: aws.String(d.Get(names.AttrType).(string)), - ApiCachingBehavior: aws.String(d.Get("api_caching_behavior").(string)), - Ttl: aws.Int64(int64(d.Get("ttl").(int))), + Ttl: int64(d.Get("ttl").(int)), + Type: awstypes.ApiCacheType(d.Get(names.AttrType).(string)), } if v, ok := d.GetOk("at_rest_encryption_enabled"); ok { - params.AtRestEncryptionEnabled = aws.Bool(v.(bool)) + input.AtRestEncryptionEnabled = v.(bool) } if v, ok := d.GetOk("transit_encryption_enabled"); ok { - params.TransitEncryptionEnabled = aws.Bool(v.(bool)) + input.TransitEncryptionEnabled = v.(bool) } - _, err := conn.CreateApiCacheWithContext(ctx, params) + _, err := conn.CreateApiCache(ctx, input) + if err != nil { - return sdkdiag.AppendErrorf(diags, "creating Appsync API Cache: %s", err) + return sdkdiag.AppendErrorf(diags, "creating Appsync API Cache (%s): %s", apiID, err) } d.SetId(apiID) - if err := waitAPICacheAvailable(ctx, conn, d.Id()); err != nil { - return sdkdiag.AppendErrorf(diags, "waiting for Appsync API Cache (%s) availability: %s", d.Id(), err) + if _, err := waitAPICacheAvailable(ctx, conn, d.Id()); err != nil { + return sdkdiag.AppendErrorf(diags, "waiting for Appsync API Cache (%s) create: %s", d.Id(), err) } return append(diags, resourceAPICacheRead(ctx, d, meta)...) @@ -100,9 +104,10 @@ func resourceAPICacheCreate(ctx context.Context, d *schema.ResourceData, meta in func resourceAPICacheRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + + cache, err := findAPICacheByID(ctx, conn, d.Id()) - cache, err := FindAPICacheByID(ctx, conn, d.Id()) if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] AppSync API Cache (%s) not found, removing from state", d.Id()) d.SetId("") @@ -110,46 +115,47 @@ func resourceAPICacheRead(ctx context.Context, d *schema.ResourceData, meta inte } if err != nil { - return sdkdiag.AppendErrorf(diags, "getting Appsync API Cache %q: %s", d.Id(), err) + return sdkdiag.AppendErrorf(diags, "reading Appsync API Cache (%s): %s", d.Id(), err) } - d.Set("api_id", d.Id()) - d.Set(names.AttrType, cache.Type) d.Set("api_caching_behavior", cache.ApiCachingBehavior) - d.Set("ttl", cache.Ttl) + d.Set("api_id", d.Id()) d.Set("at_rest_encryption_enabled", cache.AtRestEncryptionEnabled) d.Set("transit_encryption_enabled", cache.TransitEncryptionEnabled) + d.Set("ttl", cache.Ttl) + d.Set(names.AttrType, cache.Type) return diags } func resourceAPICacheUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - params := &appsync.UpdateApiCacheInput{ + input := &appsync.UpdateApiCacheInput{ ApiId: aws.String(d.Id()), } - if d.HasChange(names.AttrType) { - params.Type = aws.String(d.Get(names.AttrType).(string)) - } - if d.HasChange("api_caching_behavior") { - params.ApiCachingBehavior = aws.String(d.Get("api_caching_behavior").(string)) + input.ApiCachingBehavior = awstypes.ApiCachingBehavior(d.Get("api_caching_behavior").(string)) } if d.HasChange("ttl") { - params.Ttl = aws.Int64(int64(d.Get("ttl").(int))) + input.Ttl = int64(d.Get("ttl").(int)) + } + + if d.HasChange(names.AttrType) { + input.Type = awstypes.ApiCacheType(d.Get(names.AttrType).(string)) } - _, err := conn.UpdateApiCacheWithContext(ctx, params) + _, err := conn.UpdateApiCache(ctx, input) + if err != nil { return sdkdiag.AppendErrorf(diags, "updating Appsync API Cache %q: %s", d.Id(), err) } - if err := waitAPICacheAvailable(ctx, conn, d.Id()); err != nil { - return sdkdiag.AppendErrorf(diags, "waiting for Appsync API Cache (%s) availability: %s", d.Id(), err) + if _, err := waitAPICacheAvailable(ctx, conn, d.Id()); err != nil { + return sdkdiag.AppendErrorf(diags, "waiting for Appsync API Cache (%s) update: %s", d.Id(), err) } return append(diags, resourceAPICacheRead(ctx, d, meta)...) @@ -157,22 +163,105 @@ func resourceAPICacheUpdate(ctx context.Context, d *schema.ResourceData, meta in func resourceAPICacheDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - input := &appsync.DeleteApiCacheInput{ + log.Printf("[INFO] Deleting Appsync API Cache: %s", d.Id()) + _, err := conn.DeleteApiCache(ctx, &appsync.DeleteApiCacheInput{ ApiId: aws.String(d.Id()), + }) + + if errs.IsA[*awstypes.NotFoundException](err) { + return diags + } + + if err != nil { + return sdkdiag.AppendErrorf(diags, "deleting Appsync API Cache (%s): %s", d.Id(), err) + } + + if _, err := waitAPICacheDeleted(ctx, conn, d.Id()); err != nil { + return sdkdiag.AppendErrorf(diags, "waiting for Appsync API Cache (%s) delete: %s", d.Id(), err) + } + + return diags +} + +func findAPICacheByID(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiCache, error) { + input := &appsync.GetApiCacheInput{ + ApiId: aws.String(id), } - _, err := conn.DeleteApiCacheWithContext(ctx, input) + + output, err := conn.GetApiCache(ctx, input) + + if errs.IsA[*awstypes.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } + } + if err != nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { - return diags + return nil, err + } + + if output == nil || output.ApiCache == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output.ApiCache, nil +} + +func statusAPICache(ctx context.Context, conn *appsync.Client, name string) retry.StateRefreshFunc { + return func() (interface{}, string, error) { + output, err := findAPICacheByID(ctx, conn, name) + + if tfresource.NotFound(err) { + return nil, "", nil + } + + if err != nil { + return nil, "", err } - return sdkdiag.AppendErrorf(diags, "deleting Appsync API Cache: %s", err) + + return output, string(output.Status), nil } +} - if err := waitAPICacheDeleted(ctx, conn, d.Id()); err != nil { - return sdkdiag.AppendErrorf(diags, "waiting for Appsync API Cache (%s) to be deleted: %s", d.Id(), err) +func waitAPICacheAvailable(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiCache, error) { + const ( + timeout = 60 * time.Minute + ) + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(awstypes.ApiCacheStatusCreating, awstypes.ApiCacheStatusModifying), + Target: enum.Slice(awstypes.ApiCacheStatusAvailable), + Refresh: statusAPICache(ctx, conn, id), + Timeout: timeout, } - return diags + outputRaw, err := stateConf.WaitForStateContext(ctx) + + if output, ok := outputRaw.(*awstypes.ApiCache); ok { + return output, err + } + + return nil, err +} + +func waitAPICacheDeleted(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiCache, error) { + const ( + timeout = 60 * time.Minute + ) + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(awstypes.ApiCacheStatusDeleting), + Target: []string{}, + Refresh: statusAPICache(ctx, conn, id), + Timeout: timeout, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + + if output, ok := outputRaw.(*awstypes.ApiCache); ok { + return output, err + } + + return nil, err } diff --git a/internal/service/appsync/api_cache_test.go b/internal/service/appsync/api_cache_test.go index dd4be59fc4c..e3a7c4f8876 100644 --- a/internal/service/appsync/api_cache_test.go +++ b/internal/service/appsync/api_cache_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/aws/aws-sdk-go/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -21,12 +21,12 @@ import ( func testAccAPICache_basic(t *testing.T) { ctx := acctest.Context(t) - var apiCache appsync.ApiCache + var apiCache awstypes.ApiCache resourceName := "aws_appsync_api_cache.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPICacheDestroy(ctx), @@ -51,12 +51,12 @@ func testAccAPICache_basic(t *testing.T) { func testAccAPICache_disappears(t *testing.T) { ctx := acctest.Context(t) - var apiCache appsync.ApiCache + var apiCache awstypes.ApiCache resourceName := "aws_appsync_api_cache.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPICacheDestroy(ctx), @@ -75,40 +75,46 @@ func testAccAPICache_disappears(t *testing.T) { func testAccCheckAPICacheDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_api_cache" { continue } _, err := tfappsync.FindAPICacheByID(ctx, conn, rs.Primary.ID) - if err == nil { - if tfresource.NotFound(err) { - return nil - } + + if tfresource.NotFound(err) { + continue + } + + if err != nil { return err } - return nil + return fmt.Errorf("Appsync API Cache %s still exists", rs.Primary.ID) } + return nil } } -func testAccCheckAPICacheExists(ctx context.Context, resourceName string, apiCache *appsync.ApiCache) resource.TestCheckFunc { +func testAccCheckAPICacheExists(ctx context.Context, n string, v *awstypes.ApiCache) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] + rs, ok := s.RootModule().Resources[n] if !ok { - return fmt.Errorf("Appsync Api Cache Not found in state: %s", resourceName) + return fmt.Errorf("Not found: %s", n) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) - cache, err := tfappsync.FindAPICacheByID(ctx, conn, rs.Primary.ID) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + + output, err := tfappsync.FindAPICacheByID(ctx, conn, rs.Primary.ID) + if err != nil { return err } - *apiCache = *cache + *v = *output return nil } diff --git a/internal/service/appsync/exports_test.go b/internal/service/appsync/exports_test.go new file mode 100644 index 00000000000..929c39f88eb --- /dev/null +++ b/internal/service/appsync/exports_test.go @@ -0,0 +1,11 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package appsync + +// Exports for use in tests only. +var ( + ResourceAPICache = resourceAPICache + + FindAPICacheByID = findAPICacheByID +) diff --git a/internal/service/appsync/find.go b/internal/service/appsync/find.go index 05906df4040..fc7f708eef2 100644 --- a/internal/service/appsync/find.go +++ b/internal/service/appsync/find.go @@ -13,30 +13,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) -func FindAPICacheByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.ApiCache, error) { - input := &appsync.GetApiCacheInput{ - ApiId: aws.String(id), - } - out, err := conn.GetApiCacheWithContext(ctx, input) - - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { - return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: input, - } - } - - if err != nil { - return nil, err - } - - if out == nil { - return nil, tfresource.NewEmptyResultError(input) - } - - return out.ApiCache, nil -} - func FindDomainNameByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.DomainNameConfig, error) { input := &appsync.GetDomainNameInput{ DomainName: aws.String(id), diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index ccff38acc5f..f109d3377d6 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -30,8 +30,9 @@ func (p *servicePackage) SDKDataSources(ctx context.Context) []*types.ServicePac func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePackageSDKResource { return []*types.ServicePackageSDKResource{ { - Factory: ResourceAPICache, + Factory: resourceAPICache, TypeName: "aws_appsync_api_cache", + Name: "API Cache", }, { Factory: ResourceAPIKey, diff --git a/internal/service/appsync/status.go b/internal/service/appsync/status.go index 7b3ecbbd352..a0a4aae206a 100644 --- a/internal/service/appsync/status.go +++ b/internal/service/appsync/status.go @@ -12,22 +12,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) -func StatusAPICache(ctx context.Context, conn *appsync.AppSync, name string) retry.StateRefreshFunc { - return func() (interface{}, string, error) { - output, err := FindAPICacheByID(ctx, conn, name) - - if tfresource.NotFound(err) { - return nil, "", nil - } - - if err != nil { - return nil, "", err - } - - return output, aws.StringValue(output.Status), nil - } -} - func statusDomainNameAPIAssociation(ctx context.Context, conn *appsync.AppSync, id string) retry.StateRefreshFunc { return func() (interface{}, string, error) { output, err := FindDomainNameAPIAssociationByID(ctx, conn, id) diff --git a/internal/service/appsync/wait.go b/internal/service/appsync/wait.go index 59bd7cb9c48..511f903aa21 100644 --- a/internal/service/appsync/wait.go +++ b/internal/service/appsync/wait.go @@ -12,38 +12,10 @@ import ( ) const ( - apiCacheAvailableTimeout = 60 * time.Minute - apiCacheDeletedTimeout = 60 * time.Minute domainNameAPIAssociationTimeout = 60 * time.Minute domainNameAPIDisassociationTimeout = 60 * time.Minute ) -func waitAPICacheAvailable(ctx context.Context, conn *appsync.AppSync, id string) error { - stateConf := &retry.StateChangeConf{ - Pending: []string{appsync.ApiCacheStatusCreating, appsync.ApiCacheStatusModifying}, - Target: []string{appsync.ApiCacheStatusAvailable}, - Refresh: StatusAPICache(ctx, conn, id), - Timeout: apiCacheAvailableTimeout, - } - - _, err := stateConf.WaitForStateContext(ctx) - - return err -} - -func waitAPICacheDeleted(ctx context.Context, conn *appsync.AppSync, id string) error { - stateConf := &retry.StateChangeConf{ - Pending: []string{appsync.ApiCacheStatusDeleting}, - Target: []string{}, - Refresh: StatusAPICache(ctx, conn, id), - Timeout: apiCacheDeletedTimeout, - } - - _, err := stateConf.WaitForStateContext(ctx) - - return err -} - func waitDomainNameAPIAssociation(ctx context.Context, conn *appsync.AppSync, id string) error { stateConf := &retry.StateChangeConf{ Pending: []string{appsync.AssociationStatusProcessing}, From d4333a0ba02b4aa8bcaf3ca08d5ffc9a385c7a8d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 19 Jun 2024 11:50:43 -0400 Subject: [PATCH 008/208] r/aws_appsync_api_key: Migrate to AWS SDK for Go v2. --- .changelog/36568.txt | 3 + internal/service/appsync/api_key.go | 179 ++++++++++++------ internal/service/appsync/api_key_test.go | 65 +++---- internal/service/appsync/exports_test.go | 4 +- internal/service/appsync/generate.go | 1 + internal/service/appsync/list_pages_gen.go | 27 +++ .../service/appsync/service_package_gen.go | 3 +- 7 files changed, 182 insertions(+), 100 deletions(-) create mode 100644 .changelog/36568.txt create mode 100644 internal/service/appsync/list_pages_gen.go diff --git a/.changelog/36568.txt b/.changelog/36568.txt new file mode 100644 index 00000000000..c1789bde97a --- /dev/null +++ b/.changelog/36568.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_appsync_api_key: Add `api_key_id` attribute +``` \ No newline at end of file diff --git a/internal/service/appsync/api_key.go b/internal/service/appsync/api_key.go index fbdf814b82a..c8d052b7a84 100644 --- a/internal/service/appsync/api_key.go +++ b/internal/service/appsync/api_key.go @@ -10,43 +10,52 @@ import ( "strings" "time" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" + tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) -// @SDKResource("aws_appsync_api_key") -func ResourceAPIKey() *schema.Resource { +// @SDKResource("aws_appsync_api_key", name="API Key") +func resourceAPIKey() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceAPIKeyCreate, ReadWithoutTimeout: resourceAPIKeyRead, UpdateWithoutTimeout: resourceAPIKeyUpdate, DeleteWithoutTimeout: resourceAPIKeyDelete, + Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, Schema: map[string]*schema.Schema{ + "api_id": { + Type: schema.TypeString, + Required: true, + }, + "api_key_id": { + Type: schema.TypeString, + Computed: true, + }, names.AttrDescription: { Type: schema.TypeString, Optional: true, Default: "Managed by Terraform", }, - "api_id": { - Type: schema.TypeString, - Required: true, - }, "expires": { Type: schema.TypeString, Optional: true, DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - // Ignore unsetting value + // Ignore unsetting value. if old != "" && new == "" { return true } @@ -65,75 +74,85 @@ func ResourceAPIKey() *schema.Resource { func resourceAPIKeyCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID := d.Get("api_id").(string) - - params := &appsync.CreateApiKeyInput{ + input := &appsync.CreateApiKeyInput{ ApiId: aws.String(apiID), Description: aws.String(d.Get(names.AttrDescription).(string)), } + if v, ok := d.GetOk("expires"); ok { t, _ := time.Parse(time.RFC3339, v.(string)) - params.Expires = aws.Int64(t.Unix()) + input.Expires = t.Unix() } - resp, err := conn.CreateApiKeyWithContext(ctx, params) + + output, err := conn.CreateApiKey(ctx, input) + if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync API Key: %s", err) } - d.SetId(fmt.Sprintf("%s:%s", apiID, aws.StringValue(resp.ApiKey.Id))) + d.SetId(apiKeyCreateResourceID(apiID, aws.ToString(output.ApiKey.Id))) + return append(diags, resourceAPIKeyRead(ctx, d, meta)...) } func resourceAPIKeyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - apiID, keyID, err := DecodeAPIKeyID(d.Id()) + apiID, keyID, err := apiKeyParseResourceID(d.Id()) if err != nil { - return sdkdiag.AppendErrorf(diags, "reading Appsync API Key (%s): %s", d.Id(), err) + return sdkdiag.AppendFromErr(diags, err) } - key, err := GetAPIKey(ctx, apiID, keyID, conn) - if err != nil { - return sdkdiag.AppendErrorf(diags, "reading Appsync API Key (%s): %s", d.Id(), err) - } - if key == nil && !d.IsNewResource() { + key, err := findAPIKeyByTwoPartKey(ctx, conn, apiID, keyID) + + if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] AppSync API Key (%s) not found, removing from state", d.Id()) d.SetId("") return diags } + if err != nil { + return sdkdiag.AppendErrorf(diags, "reading Appsync API Key (%s): %s", d.Id(), err) + } + d.Set("api_id", apiID) - d.Set(names.AttrKey, key.Id) + d.Set("api_key_id", keyID) d.Set(names.AttrDescription, key.Description) - d.Set("expires", time.Unix(aws.Int64Value(key.Expires), 0).UTC().Format(time.RFC3339)) + d.Set("expires", time.Unix(key.Expires, 0).UTC().Format(time.RFC3339)) + d.Set(names.AttrKey, key.Id) + return diags } func resourceAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - apiID, keyID, err := DecodeAPIKeyID(d.Id()) + apiID, keyID, err := apiKeyParseResourceID(d.Id()) if err != nil { - return sdkdiag.AppendErrorf(diags, "updating Appsync API Key (%s): %s", d.Id(), err) + return sdkdiag.AppendFromErr(diags, err) } - params := &appsync.UpdateApiKeyInput{ + input := &appsync.UpdateApiKeyInput{ ApiId: aws.String(apiID), Id: aws.String(keyID), } + if d.HasChange(names.AttrDescription) { - params.Description = aws.String(d.Get(names.AttrDescription).(string)) + input.Description = aws.String(d.Get(names.AttrDescription).(string)) } + if d.HasChange("expires") { t, _ := time.Parse(time.RFC3339, d.Get("expires").(string)) - params.Expires = aws.Int64(t.Unix()) + input.Expires = t.Unix() } - _, err = conn.UpdateApiKeyWithContext(ctx, params) + _, err = conn.UpdateApiKey(ctx, input) + if err != nil { return sdkdiag.AppendErrorf(diags, "updating Appsync API Key (%s): %s", d.Id(), err) } @@ -143,54 +162,96 @@ func resourceAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, meta inte func resourceAPIKeyDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - apiID, keyID, err := DecodeAPIKeyID(d.Id()) + apiID, keyID, err := apiKeyParseResourceID(d.Id()) if err != nil { - return sdkdiag.AppendErrorf(diags, "deleting Appsync API Key (%s): %s", d.Id(), err) + return sdkdiag.AppendFromErr(diags, err) } - input := &appsync.DeleteApiKeyInput{ + log.Printf("[INFO] Deleting Appsync API Key: %s", d.Id()) + _, err = conn.DeleteApiKey(ctx, &appsync.DeleteApiKeyInput{ ApiId: aws.String(apiID), Id: aws.String(keyID), + }) + + if errs.IsA[*awstypes.NotFoundException](err) { + return diags } - _, err = conn.DeleteApiKeyWithContext(ctx, input) + if err != nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { - return diags - } return sdkdiag.AppendErrorf(diags, "deleting Appsync API Key (%s): %s", d.Id(), err) } return diags } -func DecodeAPIKeyID(id string) (string, string, error) { - parts := strings.Split(id, ":") - if len(parts) != 2 { - return "", "", fmt.Errorf("Unexpected format of ID (%q), expected API-ID:API-KEY-ID", id) +const apiKeyResourceIDSeparator = ":" + +func apiKeyCreateResourceID(apiID, keyID string) string { + parts := []string{apiID, keyID} + id := strings.Join(parts, apiKeyResourceIDSeparator) + + return id +} + +func apiKeyParseResourceID(id string) (string, string, error) { //nolint:unparam + parts := strings.Split(id, apiKeyResourceIDSeparator) + + if len(parts) != 2 || parts[0] == "" || parts[1] == "" { + return "", "", fmt.Errorf("unexpected format for ID (%[1]s), expected API-ID%[2]sAPI-KEY-ID", id, apiKeyResourceIDSeparator) } + return parts[0], parts[1], nil } -func GetAPIKey(ctx context.Context, apiID, keyID string, conn *appsync.AppSync) (*appsync.ApiKey, error) { - input := &appsync.ListApiKeysInput{ - ApiId: aws.String(apiID), +func findAPIKey(ctx context.Context, conn *appsync.Client, input *appsync.ListApiKeysInput, filter tfslices.Predicate[*awstypes.ApiKey]) (*awstypes.ApiKey, error) { + output, err := findAPIKeys(ctx, conn, input, filter) + + if err != nil { + return nil, err } - for { - resp, err := conn.ListApiKeysWithContext(ctx, input) - if err != nil { - return nil, err + + return tfresource.AssertSingleValueResult(output) +} + +func findAPIKeys(ctx context.Context, conn *appsync.Client, input *appsync.ListApiKeysInput, filter tfslices.Predicate[*awstypes.ApiKey]) ([]awstypes.ApiKey, error) { + var output []awstypes.ApiKey + + err := listAPIKeysPages(ctx, conn, input, func(page *appsync.ListApiKeysOutput, lastPage bool) bool { + if page == nil { + return !lastPage } - for _, apiKey := range resp.ApiKeys { - if aws.StringValue(apiKey.Id) == keyID { - return apiKey, nil + + for _, v := range page.ApiKeys { + if filter(&v) { + output = append(output, v) } } - if resp.NextToken == nil { - break + + return !lastPage + }) + + if errs.IsA[*awstypes.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, } - input.NextToken = resp.NextToken } - return nil, nil + + if err != nil { + return nil, err + } + + return output, nil +} + +func findAPIKeyByTwoPartKey(ctx context.Context, conn *appsync.Client, apiID, keyID string) (*awstypes.ApiKey, error) { + input := &appsync.ListApiKeysInput{ + ApiId: aws.String(apiID), + } + + return findAPIKey(ctx, conn, input, func(v *awstypes.ApiKey) bool { + return aws.ToString(v.Id) == keyID + }) } diff --git a/internal/service/appsync/api_key_test.go b/internal/service/appsync/api_key_test.go index e552094a157..b7331674857 100644 --- a/internal/service/appsync/api_key_test.go +++ b/internal/service/appsync/api_key_test.go @@ -10,27 +10,26 @@ import ( "time" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) func testAccAPIKey_basic(t *testing.T) { ctx := acctest.Context(t) - var apiKey appsync.ApiKey + var apiKey awstypes.ApiKey dateAfterSevenDays := time.Now().UTC().Add(time.Hour * 24 * time.Duration(7)).Truncate(time.Hour) resourceName := "aws_appsync_api_key.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPIKeyDestroy(ctx), @@ -55,12 +54,12 @@ func testAccAPIKey_basic(t *testing.T) { func testAccAPIKey_description(t *testing.T) { ctx := acctest.Context(t) - var apiKey appsync.ApiKey + var apiKey awstypes.ApiKey resourceName := "aws_appsync_api_key.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPIKeyDestroy(ctx), @@ -90,14 +89,14 @@ func testAccAPIKey_description(t *testing.T) { func testAccAPIKey_expires(t *testing.T) { ctx := acctest.Context(t) - var apiKey appsync.ApiKey + var apiKey awstypes.ApiKey dateAfterTenDays := time.Now().UTC().Add(time.Hour * 24 * time.Duration(10)).Truncate(time.Hour) dateAfterTwentyDays := time.Now().UTC().Add(time.Hour * 24 * time.Duration(20)).Truncate(time.Hour) resourceName := "aws_appsync_api_key.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckAPIKeyDestroy(ctx), @@ -127,66 +126,54 @@ func testAccAPIKey_expires(t *testing.T) { func testAccCheckAPIKeyDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_api_key" { continue } - apiID, keyID, err := tfappsync.DecodeAPIKeyID(rs.Primary.ID) - if err != nil { - return err - } + _, err := tfappsync.FindAPIKeyByTwoPartKey(ctx, conn, rs.Primary.Attributes["api_id"], rs.Primary.Attributes["api_key_id"]) - apiKey, err := tfappsync.GetAPIKey(ctx, apiID, keyID, conn) - if err == nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { - return nil - } - return err + if tfresource.NotFound(err) { + continue } - if apiKey != nil && aws.StringValue(apiKey.Id) == keyID { - return fmt.Errorf("Appsync API Key ID %q still exists", rs.Primary.ID) + if err != nil { + return err } - return nil + return fmt.Errorf("Appsync API Key %s still exists", rs.Primary.ID) } + return nil } } -func testAccCheckAPIKeyExists(ctx context.Context, resourceName string, apiKey *appsync.ApiKey) resource.TestCheckFunc { +func testAccCheckAPIKeyExists(ctx context.Context, n string, v *awstypes.ApiKey) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] + rs, ok := s.RootModule().Resources[n] if !ok { - return fmt.Errorf("Appsync API Key Not found in state: %s", resourceName) + return fmt.Errorf("Not found: %s", n) } - apiID, keyID, err := tfappsync.DecodeAPIKeyID(rs.Primary.ID) - if err != nil { - return err - } + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + + output, err := tfappsync.FindAPIKeyByTwoPartKey(ctx, conn, rs.Primary.Attributes["api_id"], rs.Primary.Attributes["api_key_id"]) - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) - key, err := tfappsync.GetAPIKey(ctx, apiID, keyID, conn) if err != nil { return err } - if key == nil || key.Id == nil { - return fmt.Errorf("Appsync API Key %q not found", rs.Primary.ID) - } - - *apiKey = *key + *v = *output return nil } } -func testAccCheckAPIKeyExpiresDate(apiKey *appsync.ApiKey, expectedTime time.Time) resource.TestCheckFunc { +func testAccCheckAPIKeyExpiresDate(apiKey *awstypes.ApiKey, expectedTime time.Time) resource.TestCheckFunc { return func(s *terraform.State) error { - apiKeyExpiresTime := time.Unix(aws.Int64Value(apiKey.Expires), 0) + apiKeyExpiresTime := time.Unix(apiKey.Expires, 0) if !apiKeyExpiresTime.Equal(expectedTime) { return fmt.Errorf("Appsync API Key expires difference: got %s and expected %s", apiKeyExpiresTime.Format(time.RFC3339), expectedTime.Format(time.RFC3339)) } diff --git a/internal/service/appsync/exports_test.go b/internal/service/appsync/exports_test.go index 929c39f88eb..bcdcadb675c 100644 --- a/internal/service/appsync/exports_test.go +++ b/internal/service/appsync/exports_test.go @@ -6,6 +6,8 @@ package appsync // Exports for use in tests only. var ( ResourceAPICache = resourceAPICache + ResourceAPIKey = resourceAPIKey - FindAPICacheByID = findAPICacheByID + FindAPICacheByID = findAPICacheByID + FindAPIKeyByTwoPartKey = findAPIKeyByTwoPartKey ) diff --git a/internal/service/appsync/generate.go b/internal/service/appsync/generate.go index 93bd9782d71..7bbb855d46a 100644 --- a/internal/service/appsync/generate.go +++ b/internal/service/appsync/generate.go @@ -1,6 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 +//go:generate go run ../../generate/listpages/main.go -AWSSDKVersion=2 -ListOps=ListApiKeys //go:generate go run ../../generate/tags/main.go -AWSSDKVersion=2 -ListTags -ServiceTagsMap -UpdateTags -KVTValues -SkipTypesImp //go:generate go run ../../generate/servicepackage/main.go // ONLY generate directives and package declaration! Do not add anything else to this file. diff --git a/internal/service/appsync/list_pages_gen.go b/internal/service/appsync/list_pages_gen.go new file mode 100644 index 00000000000..9b00855361a --- /dev/null +++ b/internal/service/appsync/list_pages_gen.go @@ -0,0 +1,27 @@ +// Code generated by "internal/generate/listpages/main.go -AWSSDKVersion=2 -ListOps=ListApiKeys"; DO NOT EDIT. + +package appsync + +import ( + "context" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" +) + +func listAPIKeysPages(ctx context.Context, conn *appsync.Client, input *appsync.ListApiKeysInput, fn func(*appsync.ListApiKeysOutput, bool) bool) error { + for { + output, err := conn.ListApiKeys(ctx, input) + if err != nil { + return err + } + + lastPage := aws.ToString(output.NextToken) == "" + if !fn(output, lastPage) || lastPage { + break + } + + input.NextToken = output.NextToken + } + return nil +} diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index f109d3377d6..c01f1d2574b 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -35,8 +35,9 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePacka Name: "API Cache", }, { - Factory: ResourceAPIKey, + Factory: resourceAPIKey, TypeName: "aws_appsync_api_key", + Name: "API Key", }, { Factory: ResourceDataSource, From c12170c71fad5e60066c5ba53907a88bfa1d3540 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 19 Jun 2024 13:37:41 -0400 Subject: [PATCH 009/208] r/aws_appsync_datasource: Migrate to AWS SDK for Go v2. --- internal/sdkv2/state.go | 13 + internal/sdkv2/state_test.go | 23 + internal/service/appsync/api_key.go | 2 +- internal/service/appsync/datasource.go | 498 +++++++++--------- internal/service/appsync/datasource_test.go | 68 +-- internal/service/appsync/exports_test.go | 10 +- .../service/appsync/service_package_gen.go | 3 +- 7 files changed, 314 insertions(+), 303 deletions(-) create mode 100644 internal/sdkv2/state.go create mode 100644 internal/sdkv2/state_test.go diff --git a/internal/sdkv2/state.go b/internal/sdkv2/state.go new file mode 100644 index 00000000000..fe2bb36a2b0 --- /dev/null +++ b/internal/sdkv2/state.go @@ -0,0 +1,13 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package sdkv2 + +import ( + "strings" +) + +// ToUpperSchemaStateFunc converts a string value to uppercase before storing it in state. +func ToUpperSchemaStateFunc(v interface{}) string { + return strings.ToUpper(v.(string)) +} diff --git a/internal/sdkv2/state_test.go b/internal/sdkv2/state_test.go new file mode 100644 index 00000000000..dcb7d943271 --- /dev/null +++ b/internal/sdkv2/state_test.go @@ -0,0 +1,23 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package sdkv2 + +import ( + "testing" + + "github.com/google/go-cmp/cmp" +) + +func TestToUpperSchemaStateFunc(t *testing.T) { + t.Parallel() + + var input interface{} = "in-state" + want := "IN-STATE" + + got := ToUpperSchemaStateFunc(input) + + if diff := cmp.Diff(got, want); diff != "" { + t.Errorf("unexpected diff (+want, -got): %s", diff) + } +} diff --git a/internal/service/appsync/api_key.go b/internal/service/appsync/api_key.go index c8d052b7a84..fbdca7da916 100644 --- a/internal/service/appsync/api_key.go +++ b/internal/service/appsync/api_key.go @@ -195,7 +195,7 @@ func apiKeyCreateResourceID(apiID, keyID string) string { return id } -func apiKeyParseResourceID(id string) (string, string, error) { //nolint:unparam +func apiKeyParseResourceID(id string) (string, string, error) { parts := strings.Split(id, apiKeyResourceIDSeparator) if len(parts) != 2 || parts[0] == "" || parts[1] == "" { diff --git a/internal/service/appsync/datasource.go b/internal/service/appsync/datasource.go index 5d84ef17a3a..a7d5c584192 100644 --- a/internal/service/appsync/datasource.go +++ b/internal/service/appsync/datasource.go @@ -10,22 +10,25 @@ import ( "strings" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" + "github.com/hashicorp/terraform-provider-aws/internal/sdkv2" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) -// @SDKResource("aws_appsync_datasource") -func ResourceDataSource() *schema.Resource { +// @SDKResource("aws_appsync_datasource", name="Data Source") +func resourceDataSource() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceDataSourceCreate, ReadWithoutTimeout: resourceDataSourceRead, @@ -144,10 +147,10 @@ func ResourceDataSource() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "authorization_type": { - Type: schema.TypeString, - Optional: true, - Default: appsync.AuthorizationTypeAwsIam, - ValidateFunc: validation.StringInSlice(appsync.AuthorizationType_Values(), true), + Type: schema.TypeString, + Optional: true, + Default: awstypes.AuthorizationTypeAwsIam, + ValidateDiagFunc: enum.Validate[awstypes.AuthorizationType](), }, "aws_iam_config": { Type: schema.TypeList, @@ -254,10 +257,10 @@ func ResourceDataSource() *schema.Resource { }, }, names.AttrSourceType: { - Type: schema.TypeString, - Optional: true, - Default: appsync.RelationalDatabaseSourceTypeRdsHttpEndpoint, - ValidateFunc: validation.StringInSlice(appsync.RelationalDatabaseSourceType_Values(), true), + Type: schema.TypeString, + Optional: true, + Default: awstypes.RelationalDatabaseSourceTypeRdsHttpEndpoint, + ValidateDiagFunc: enum.Validate[awstypes.RelationalDatabaseSourceType](), }, }, }, @@ -269,12 +272,10 @@ func ResourceDataSource() *schema.Resource { ValidateFunc: verify.ValidARN, }, names.AttrType: { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.DataSourceType_Values(), true), - StateFunc: func(v interface{}) string { - return strings.ToUpper(v.(string)) - }, + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.DataSourceType](), + StateFunc: sdkv2.ToUpperSchemaStateFunc, }, }, } @@ -282,14 +283,16 @@ func ResourceDataSource() *schema.Resource { func resourceDataSourceCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) region := meta.(*conns.AWSClient).Region + apiID := d.Get("api_id").(string) name := d.Get(names.AttrName).(string) + id := dataSourceCreateResourceID(apiID, name) input := &appsync.CreateDataSourceInput{ - ApiId: aws.String(d.Get("api_id").(string)), + ApiId: aws.String(apiID), Name: aws.String(name), - Type: aws.String(d.Get(names.AttrType).(string)), + Type: awstypes.DataSourceType(d.Get(names.AttrType).(string)), } if v, ok := d.GetOk(names.AttrDescription); ok { @@ -328,28 +331,27 @@ func resourceDataSourceCreate(ctx context.Context, d *schema.ResourceData, meta input.ServiceRoleArn = aws.String(v.(string)) } - _, err := conn.CreateDataSourceWithContext(ctx, input) + _, err := conn.CreateDataSource(ctx, input) if err != nil { - return sdkdiag.AppendErrorf(diags, "creating Appsync Data Source (%s): %s", name, err) + return sdkdiag.AppendErrorf(diags, "creating Appsync Data Source (%s): %s", id, err) } - d.SetId(d.Get("api_id").(string) + "-" + d.Get(names.AttrName).(string)) + d.SetId(id) return append(diags, resourceDataSourceRead(ctx, d, meta)...) } func resourceDataSourceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) - - apiID, name, err := DecodeID(d.Id()) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + apiID, name, err := dataSourceParseResourceID(d.Id()) if err != nil { return sdkdiag.AppendFromErr(diags, err) } - dataSource, err := FindDataSourceByTwoPartKey(ctx, conn, apiID, name) + dataSource, err := findDataSourceByTwoPartKey(ctx, conn, apiID, name) if tfresource.NotFound(err) && !d.IsNewResource() { log.Printf("[WARN] AppSync Datasource %q not found, removing from state", d.Id()) @@ -394,11 +396,10 @@ func resourceDataSourceRead(ctx context.Context, d *schema.ResourceData, meta in func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) region := meta.(*conns.AWSClient).Region - apiID, name, err := DecodeID(d.Id()) - + apiID, name, err := dataSourceParseResourceID(d.Id()) if err != nil { return sdkdiag.AppendFromErr(diags, err) } @@ -406,7 +407,7 @@ func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta input := &appsync.UpdateDataSourceInput{ ApiId: aws.String(apiID), Name: aws.String(name), - Type: aws.String(d.Get(names.AttrType).(string)), + Type: awstypes.DataSourceType(d.Get(names.AttrType).(string)), } if v, ok := d.GetOk(names.AttrDescription); ok { @@ -441,7 +442,7 @@ func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta input.ServiceRoleArn = aws.String(v.(string)) } - _, err = conn.UpdateDataSourceWithContext(ctx, input) + _, err = conn.UpdateDataSource(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "updating Appsync Data Source (%s): %s", d.Id(), err) @@ -452,22 +453,20 @@ func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta func resourceDataSourceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) - - apiID, name, err := DecodeID(d.Id()) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + apiID, name, err := dataSourceParseResourceID(d.Id()) if err != nil { return sdkdiag.AppendFromErr(diags, err) } - input := &appsync.DeleteDataSourceInput{ + log.Printf("[INFO] Deleting Appsync Data Source: %s", d.Id()) + _, err = conn.DeleteDataSource(ctx, &appsync.DeleteDataSourceInput{ ApiId: aws.String(apiID), Name: aws.String(name), - } - - _, err = conn.DeleteDataSourceWithContext(ctx, input) + }) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return diags } @@ -478,15 +477,34 @@ func resourceDataSourceDelete(ctx context.Context, d *schema.ResourceData, meta return diags } -func FindDataSourceByTwoPartKey(ctx context.Context, conn *appsync.AppSync, apiID, name string) (*appsync.DataSource, error) { +const dataSourceResourceIDSeparator = "-" + +func dataSourceCreateResourceID(apiID, name string) string { + parts := []string{apiID, name} + id := strings.Join(parts, dataSourceResourceIDSeparator) + + return id +} + +func dataSourceParseResourceID(id string) (string, string, error) { + parts := strings.SplitN(id, dataSourceResourceIDSeparator, 2) + + if len(parts) != 2 || parts[0] == "" || parts[1] == "" { + return "", "", fmt.Errorf("unexpected format for ID (%[1]s), expected API-ID%[2]sDATA-SOURCE-NAME", id, dataSourceResourceIDSeparator) + } + + return parts[0], parts[1], nil +} + +func findDataSourceByTwoPartKey(ctx context.Context, conn *appsync.Client, apiID, name string) (*awstypes.DataSource, error) { input := &appsync.GetDataSourceInput{ ApiId: aws.String(apiID), Name: aws.String(name), } - output, err := conn.GetDataSourceWithContext(ctx, input) + output, err := conn.GetDataSource(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -504,421 +522,391 @@ func FindDataSourceByTwoPartKey(ctx context.Context, conn *appsync.AppSync, apiI return output.DataSource, nil } -func DecodeID(id string) (string, string, error) { - idParts := strings.SplitN(id, "-", 2) - if len(idParts) != 2 { - return "", "", fmt.Errorf("expected ID in format ApiID-DataSourceName, received: %s", id) - } - return idParts[0], idParts[1], nil -} - -func expandDynamoDBDataSourceConfig(l []interface{}, currentRegion string) *appsync.DynamodbDataSourceConfig { - if len(l) == 0 || l[0] == nil { +func expandDynamoDBDataSourceConfig(tfList []interface{}, currentRegion string) *awstypes.DynamodbDataSourceConfig { + if len(tfList) == 0 || tfList[0] == nil { return nil } - configured := l[0].(map[string]interface{}) - - result := &appsync.DynamodbDataSourceConfig{ + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.DynamodbDataSourceConfig{ AwsRegion: aws.String(currentRegion), - TableName: aws.String(configured[names.AttrTableName].(string)), + TableName: aws.String(tfMap[names.AttrTableName].(string)), } - if v, ok := configured[names.AttrRegion]; ok && v.(string) != "" { - result.AwsRegion = aws.String(v.(string)) + if v, ok := tfMap["delta_sync_config"].([]interface{}); ok && len(v) > 0 { + apiObject.DeltaSyncConfig = expandDeltaSyncConfig(v) } - if v, ok := configured["use_caller_credentials"]; ok { - result.UseCallerCredentials = aws.Bool(v.(bool)) + if v, ok := tfMap[names.AttrRegion]; ok && v.(string) != "" { + apiObject.AwsRegion = aws.String(v.(string)) } - if v, ok := configured["versioned"]; ok { - result.Versioned = aws.Bool(v.(bool)) + if v, ok := tfMap["use_caller_credentials"]; ok { + apiObject.UseCallerCredentials = v.(bool) } - if v, ok := configured["delta_sync_config"].([]interface{}); ok && len(v) > 0 { - result.DeltaSyncConfig = expandDynamoDBDataSourceDeltaSyncConfig(v) + if v, ok := tfMap["versioned"]; ok { + apiObject.Versioned = v.(bool) } - return result + return apiObject } -func expandDynamoDBDataSourceDeltaSyncConfig(l []interface{}) *appsync.DeltaSyncConfig { - if len(l) == 0 || l[0] == nil { +func expandDeltaSyncConfig(tfList []interface{}) *awstypes.DeltaSyncConfig { + if len(tfList) == 0 || tfList[0] == nil { return nil } - configured := l[0].(map[string]interface{}) + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.DeltaSyncConfig{} - result := &appsync.DeltaSyncConfig{} - - if v, ok := configured["base_table_ttl"].(int); ok { - result.BaseTableTTL = aws.Int64(int64(v)) + if v, ok := tfMap["base_table_ttl"].(int); ok { + apiObject.BaseTableTTL = int64(v) } - if v, ok := configured["delta_sync_table_ttl"].(int); ok { - result.DeltaSyncTableTTL = aws.Int64(int64(v)) + if v, ok := tfMap["delta_sync_table_ttl"].(int); ok { + apiObject.DeltaSyncTableTTL = int64(v) } - if v, ok := configured["delta_sync_table_name"].(string); ok { - result.DeltaSyncTableName = aws.String(v) + if v, ok := tfMap["delta_sync_table_name"].(string); ok { + apiObject.DeltaSyncTableName = aws.String(v) } - return result + return apiObject } -func flattenDynamoDBDataSourceConfig(config *appsync.DynamodbDataSourceConfig) []map[string]interface{} { - if config == nil { +func flattenDynamoDBDataSourceConfig(apiObject *awstypes.DynamodbDataSourceConfig) []interface{} { + if apiObject == nil { return nil } - result := map[string]interface{}{ - names.AttrRegion: aws.StringValue(config.AwsRegion), - names.AttrTableName: aws.StringValue(config.TableName), - } - - if config.UseCallerCredentials != nil { - result["use_caller_credentials"] = aws.BoolValue(config.UseCallerCredentials) - } - - if config.Versioned != nil { - result["versioned"] = aws.BoolValue(config.Versioned) + tfMap := map[string]interface{}{ + names.AttrRegion: aws.ToString(apiObject.AwsRegion), + names.AttrTableName: aws.ToString(apiObject.TableName), + "use_caller_credentials": apiObject.UseCallerCredentials, + "versioned": apiObject.Versioned, } - if config.DeltaSyncConfig != nil { - result["delta_sync_config"] = flattenDynamoDBDataSourceDeltaSyncConfig(config.DeltaSyncConfig) + if apiObject.DeltaSyncConfig != nil { + tfMap["delta_sync_config"] = flattenDeltaSyncConfig(apiObject.DeltaSyncConfig) } - return []map[string]interface{}{result} + return []interface{}{tfMap} } -func flattenDynamoDBDataSourceDeltaSyncConfig(config *appsync.DeltaSyncConfig) []map[string]interface{} { - if config == nil { +func flattenDeltaSyncConfig(apiObject *awstypes.DeltaSyncConfig) []interface{} { + if apiObject == nil { return nil } - result := map[string]interface{}{} - - if config.DeltaSyncTableName != nil { - result["delta_sync_table_name"] = aws.StringValue(config.DeltaSyncTableName) - } - - if config.BaseTableTTL != nil { - result["base_table_ttl"] = aws.Int64Value(config.BaseTableTTL) + tfMap := map[string]interface{}{ + "base_table_ttl": apiObject.BaseTableTTL, + "delta_sync_table_ttl": apiObject.DeltaSyncTableTTL, } - if config.DeltaSyncTableTTL != nil { - result["delta_sync_table_ttl"] = aws.Int64Value(config.DeltaSyncTableTTL) + if apiObject.DeltaSyncTableName != nil { + tfMap["delta_sync_table_name"] = aws.ToString(apiObject.DeltaSyncTableName) } - return []map[string]interface{}{result} + return []interface{}{tfMap} } -func expandElasticsearchDataSourceConfig(l []interface{}, currentRegion string) *appsync.ElasticsearchDataSourceConfig { - if len(l) == 0 || l[0] == nil { +func expandElasticsearchDataSourceConfig(tfList []interface{}, currentRegion string) *awstypes.ElasticsearchDataSourceConfig { + if len(tfList) == 0 || tfList[0] == nil { return nil } - configured := l[0].(map[string]interface{}) - - result := &appsync.ElasticsearchDataSourceConfig{ + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.ElasticsearchDataSourceConfig{ AwsRegion: aws.String(currentRegion), - Endpoint: aws.String(configured[names.AttrEndpoint].(string)), + Endpoint: aws.String(tfMap[names.AttrEndpoint].(string)), } - if v, ok := configured[names.AttrRegion]; ok && v.(string) != "" { - result.AwsRegion = aws.String(v.(string)) + if v, ok := tfMap[names.AttrRegion]; ok && v.(string) != "" { + apiObject.AwsRegion = aws.String(v.(string)) } - return result + return apiObject } -func expandOpenSearchServiceDataSourceConfig(l []interface{}, currentRegion string) *appsync.OpenSearchServiceDataSourceConfig { - if len(l) == 0 || l[0] == nil { +func expandOpenSearchServiceDataSourceConfig(tfList []interface{}, currentRegion string) *awstypes.OpenSearchServiceDataSourceConfig { + if len(tfList) == 0 || tfList[0] == nil { return nil } - configured := l[0].(map[string]interface{}) - - result := &appsync.OpenSearchServiceDataSourceConfig{ + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.OpenSearchServiceDataSourceConfig{ AwsRegion: aws.String(currentRegion), - Endpoint: aws.String(configured[names.AttrEndpoint].(string)), + Endpoint: aws.String(tfMap[names.AttrEndpoint].(string)), } - if v, ok := configured[names.AttrRegion]; ok && v.(string) != "" { - result.AwsRegion = aws.String(v.(string)) + if v, ok := tfMap[names.AttrRegion]; ok && v.(string) != "" { + apiObject.AwsRegion = aws.String(v.(string)) } - return result + return apiObject } -func flattenElasticsearchDataSourceConfig(config *appsync.ElasticsearchDataSourceConfig) []map[string]interface{} { - if config == nil { +func flattenElasticsearchDataSourceConfig(apiObject *awstypes.ElasticsearchDataSourceConfig) []interface{} { + if apiObject == nil { return nil } - result := map[string]interface{}{ - names.AttrEndpoint: aws.StringValue(config.Endpoint), - names.AttrRegion: aws.StringValue(config.AwsRegion), + tfMap := map[string]interface{}{ + names.AttrEndpoint: aws.ToString(apiObject.Endpoint), + names.AttrRegion: aws.ToString(apiObject.AwsRegion), } - return []map[string]interface{}{result} + return []interface{}{tfMap} } -func flattenOpenSearchServiceDataSourceConfig(config *appsync.OpenSearchServiceDataSourceConfig) []map[string]interface{} { - if config == nil { +func flattenOpenSearchServiceDataSourceConfig(apiObject *awstypes.OpenSearchServiceDataSourceConfig) []interface{} { + if apiObject == nil { return nil } - result := map[string]interface{}{ - names.AttrEndpoint: aws.StringValue(config.Endpoint), - names.AttrRegion: aws.StringValue(config.AwsRegion), + tfMap := map[string]interface{}{ + names.AttrEndpoint: aws.ToString(apiObject.Endpoint), + names.AttrRegion: aws.ToString(apiObject.AwsRegion), } - return []map[string]interface{}{result} + return []interface{}{tfMap} } -func expandHTTPDataSourceConfig(l []interface{}) *appsync.HttpDataSourceConfig { - if len(l) == 0 || l[0] == nil { +func expandHTTPDataSourceConfig(tfList []interface{}) *awstypes.HttpDataSourceConfig { + if len(tfList) == 0 || tfList[0] == nil { return nil } - configured := l[0].(map[string]interface{}) - - result := &appsync.HttpDataSourceConfig{ - Endpoint: aws.String(configured[names.AttrEndpoint].(string)), + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.HttpDataSourceConfig{ + Endpoint: aws.String(tfMap[names.AttrEndpoint].(string)), } - if v, ok := configured["authorization_config"].([]interface{}); ok && len(v) > 0 { - result.AuthorizationConfig = expandHTTPDataSourceAuthorizationConfig(v) + if v, ok := tfMap["authorization_config"].([]interface{}); ok && len(v) > 0 { + apiObject.AuthorizationConfig = expandAuthorizationConfig(v) } - return result + return apiObject } -func flattenHTTPDataSourceConfig(config *appsync.HttpDataSourceConfig) []map[string]interface{} { - if config == nil { +func flattenHTTPDataSourceConfig(apiObject *awstypes.HttpDataSourceConfig) []interface{} { + if apiObject == nil { return nil } - result := map[string]interface{}{ - names.AttrEndpoint: aws.StringValue(config.Endpoint), + tfMap := map[string]interface{}{ + names.AttrEndpoint: aws.ToString(apiObject.Endpoint), } - if config.AuthorizationConfig != nil { - result["authorization_config"] = flattenHTTPDataSourceAuthorizationConfig(config.AuthorizationConfig) + if apiObject.AuthorizationConfig != nil { + tfMap["authorization_config"] = flattenAuthorizationConfig(apiObject.AuthorizationConfig) } - return []map[string]interface{}{result} + return []interface{}{tfMap} } -func expandHTTPDataSourceAuthorizationConfig(l []interface{}) *appsync.AuthorizationConfig { - if len(l) == 0 || l[0] == nil { +func expandAuthorizationConfig(tfList []interface{}) *awstypes.AuthorizationConfig { + if len(tfList) == 0 || tfList[0] == nil { return nil } - configured := l[0].(map[string]interface{}) - - result := &appsync.AuthorizationConfig{ - AuthorizationType: aws.String(configured["authorization_type"].(string)), + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.AuthorizationConfig{ + AuthorizationType: awstypes.AuthorizationType(tfMap["authorization_type"].(string)), } - if v, ok := configured["aws_iam_config"].([]interface{}); ok && len(v) > 0 { - result.AwsIamConfig = expandHTTPDataSourceIAMConfig(v) + if v, ok := tfMap["aws_iam_config"].([]interface{}); ok && len(v) > 0 { + apiObject.AwsIamConfig = expandAWSIAMConfig(v) } - return result + return apiObject } -func flattenHTTPDataSourceAuthorizationConfig(config *appsync.AuthorizationConfig) []map[string]interface{} { - if config == nil { +func flattenAuthorizationConfig(apiObject *awstypes.AuthorizationConfig) []interface{} { + if apiObject == nil { return nil } - result := map[string]interface{}{ - "authorization_type": aws.StringValue(config.AuthorizationType), + tfMap := map[string]interface{}{ + "authorization_type": apiObject.AuthorizationType, } - if config.AwsIamConfig != nil { - result["aws_iam_config"] = flattenHTTPDataSourceIAMConfig(config.AwsIamConfig) + if apiObject.AwsIamConfig != nil { + tfMap["aws_iam_config"] = flattenAWSIAMConfig(apiObject.AwsIamConfig) } - return []map[string]interface{}{result} + return []interface{}{tfMap} } -func expandHTTPDataSourceIAMConfig(l []interface{}) *appsync.AwsIamConfig { - if len(l) == 0 || l[0] == nil { +func expandAWSIAMConfig(tfList []interface{}) *awstypes.AwsIamConfig { + if len(tfList) == 0 || tfList[0] == nil { return nil } - configured := l[0].(map[string]interface{}) + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.AwsIamConfig{} - result := &appsync.AwsIamConfig{} - - if v, ok := configured["signing_region"].(string); ok && v != "" { - result.SigningRegion = aws.String(v) + if v, ok := tfMap["signing_region"].(string); ok && v != "" { + apiObject.SigningRegion = aws.String(v) } - if v, ok := configured["signing_service_name"].(string); ok && v != "" { - result.SigningServiceName = aws.String(v) + if v, ok := tfMap["signing_service_name"].(string); ok && v != "" { + apiObject.SigningServiceName = aws.String(v) } - return result + return apiObject } -func flattenHTTPDataSourceIAMConfig(config *appsync.AwsIamConfig) []map[string]interface{} { - if config == nil { +func flattenAWSIAMConfig(apiObject *awstypes.AwsIamConfig) []interface{} { + if apiObject == nil { return nil } - result := map[string]interface{}{ - "signing_region": aws.StringValue(config.SigningRegion), - "signing_service_name": aws.StringValue(config.SigningServiceName), + tfMap := map[string]interface{}{ + "signing_region": aws.ToString(apiObject.SigningRegion), + "signing_service_name": aws.ToString(apiObject.SigningServiceName), } - return []map[string]interface{}{result} + return []interface{}{tfMap} } -func expandLambdaDataSourceConfig(l []interface{}) *appsync.LambdaDataSourceConfig { - if len(l) == 0 || l[0] == nil { +func expandLambdaDataSourceConfig(tfList []interface{}) *awstypes.LambdaDataSourceConfig { + if len(tfList) == 0 || tfList[0] == nil { return nil } - configured := l[0].(map[string]interface{}) - - result := &appsync.LambdaDataSourceConfig{ - LambdaFunctionArn: aws.String(configured[names.AttrFunctionARN].(string)), + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.LambdaDataSourceConfig{ + LambdaFunctionArn: aws.String(tfMap[names.AttrFunctionARN].(string)), } - return result + return apiObject } -func flattenLambdaDataSourceConfig(config *appsync.LambdaDataSourceConfig) []map[string]interface{} { - if config == nil { +func flattenLambdaDataSourceConfig(apiObject *awstypes.LambdaDataSourceConfig) []interface{} { + if apiObject == nil { return nil } - result := map[string]interface{}{ - names.AttrFunctionARN: aws.StringValue(config.LambdaFunctionArn), + tfMap := map[string]interface{}{ + names.AttrFunctionARN: aws.ToString(apiObject.LambdaFunctionArn), } - return []map[string]interface{}{result} + return []interface{}{tfMap} } -func expandRelationalDatabaseDataSourceConfig(l []interface{}, currentRegion string) *appsync.RelationalDatabaseDataSourceConfig { - if len(l) == 0 || l[0] == nil { +func expandRelationalDatabaseDataSourceConfig(tfList []interface{}, currentRegion string) *awstypes.RelationalDatabaseDataSourceConfig { + if len(tfList) == 0 || tfList[0] == nil { return nil } - configured := l[0].(map[string]interface{}) - - result := &appsync.RelationalDatabaseDataSourceConfig{ - RelationalDatabaseSourceType: aws.String(configured[names.AttrSourceType].(string)), - RdsHttpEndpointConfig: testAccDataSourceConfig_expandRDSHTTPEndpoint(configured["http_endpoint_config"].([]interface{}), currentRegion), + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.RelationalDatabaseDataSourceConfig{ + RelationalDatabaseSourceType: awstypes.RelationalDatabaseSourceType(tfMap[names.AttrSourceType].(string)), + RdsHttpEndpointConfig: expandRDSHTTPEndpointConfig(tfMap["http_endpoint_config"].([]interface{}), currentRegion), } - return result + return apiObject } -func flattenRelationalDatabaseDataSourceConfig(config *appsync.RelationalDatabaseDataSourceConfig) []map[string]interface{} { - if config == nil { +func flattenRelationalDatabaseDataSourceConfig(apiObject *awstypes.RelationalDatabaseDataSourceConfig) []interface{} { + if apiObject == nil { return nil } - result := map[string]interface{}{ - names.AttrSourceType: aws.StringValue(config.RelationalDatabaseSourceType), - "http_endpoint_config": flattenRDSHTTPEndpointConfig(config.RdsHttpEndpointConfig), + tfMap := map[string]interface{}{ + names.AttrSourceType: apiObject.RelationalDatabaseSourceType, + "http_endpoint_config": flattenRDSHTTPEndpointConfig(apiObject.RdsHttpEndpointConfig), } - return []map[string]interface{}{result} + return []interface{}{tfMap} } -func expandEventBridgeDataSourceConfig(l []interface{}) *appsync.EventBridgeDataSourceConfig { - if len(l) == 0 || l[0] == nil { +func expandEventBridgeDataSourceConfig(tfList []interface{}) *awstypes.EventBridgeDataSourceConfig { + if len(tfList) == 0 || tfList[0] == nil { return nil } - configured := l[0].(map[string]interface{}) - - result := &appsync.EventBridgeDataSourceConfig{ - EventBusArn: aws.String(configured["event_bus_arn"].(string)), + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.EventBridgeDataSourceConfig{ + EventBusArn: aws.String(tfMap["event_bus_arn"].(string)), } - return result + return apiObject } -func flattenEventBridgeDataSourceConfig(config *appsync.EventBridgeDataSourceConfig) []map[string]interface{} { - if config == nil { +func flattenEventBridgeDataSourceConfig(apiObject *awstypes.EventBridgeDataSourceConfig) []interface{} { + if apiObject == nil { return nil } - result := map[string]interface{}{ - "event_bus_arn": aws.StringValue(config.EventBusArn), + tfMap := map[string]interface{}{ + "event_bus_arn": aws.ToString(apiObject.EventBusArn), } - return []map[string]interface{}{result} + return []interface{}{tfMap} } -func testAccDataSourceConfig_expandRDSHTTPEndpoint(l []interface{}, currentRegion string) *appsync.RdsHttpEndpointConfig { - if len(l) == 0 || l[0] == nil { +func expandRDSHTTPEndpointConfig(tfList []interface{}, currentRegion string) *awstypes.RdsHttpEndpointConfig { + if len(tfList) == 0 || tfList[0] == nil { return nil } - configured := l[0].(map[string]interface{}) - - result := &appsync.RdsHttpEndpointConfig{ + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.RdsHttpEndpointConfig{ AwsRegion: aws.String(currentRegion), } - if v, ok := configured[names.AttrRegion]; ok && v.(string) != "" { - result.AwsRegion = aws.String(v.(string)) + if v, ok := tfMap[names.AttrRegion]; ok && v.(string) != "" { + apiObject.AwsRegion = aws.String(v.(string)) } - if v, ok := configured["aws_secret_store_arn"]; ok && v.(string) != "" { - result.AwsSecretStoreArn = aws.String(v.(string)) + if v, ok := tfMap["aws_secret_store_arn"]; ok && v.(string) != "" { + apiObject.AwsSecretStoreArn = aws.String(v.(string)) } - if v, ok := configured[names.AttrDatabaseName]; ok && v.(string) != "" { - result.DatabaseName = aws.String(v.(string)) + if v, ok := tfMap[names.AttrDatabaseName]; ok && v.(string) != "" { + apiObject.DatabaseName = aws.String(v.(string)) } - if v, ok := configured["db_cluster_identifier"]; ok && v.(string) != "" { - result.DbClusterIdentifier = aws.String(v.(string)) + if v, ok := tfMap["db_cluster_identifier"]; ok && v.(string) != "" { + apiObject.DbClusterIdentifier = aws.String(v.(string)) } - if v, ok := configured[names.AttrSchema]; ok && v.(string) != "" { - result.Schema = aws.String(v.(string)) + if v, ok := tfMap[names.AttrSchema]; ok && v.(string) != "" { + apiObject.Schema = aws.String(v.(string)) } - return result + return apiObject } -func flattenRDSHTTPEndpointConfig(config *appsync.RdsHttpEndpointConfig) []map[string]interface{} { - if config == nil { +func flattenRDSHTTPEndpointConfig(apiObject *awstypes.RdsHttpEndpointConfig) []interface{} { + if apiObject == nil { return nil } - result := map[string]interface{}{} + tfMap := map[string]interface{}{} - if config.AwsRegion != nil { - result[names.AttrRegion] = aws.StringValue(config.AwsRegion) + if apiObject.AwsRegion != nil { + tfMap[names.AttrRegion] = aws.ToString(apiObject.AwsRegion) } - if config.AwsSecretStoreArn != nil { - result["aws_secret_store_arn"] = aws.StringValue(config.AwsSecretStoreArn) + if apiObject.AwsSecretStoreArn != nil { + tfMap["aws_secret_store_arn"] = aws.ToString(apiObject.AwsSecretStoreArn) } - if config.DatabaseName != nil { - result[names.AttrDatabaseName] = aws.StringValue(config.DatabaseName) + if apiObject.DatabaseName != nil { + tfMap[names.AttrDatabaseName] = aws.ToString(apiObject.DatabaseName) } - if config.DbClusterIdentifier != nil { - result["db_cluster_identifier"] = aws.StringValue(config.DbClusterIdentifier) + if apiObject.DbClusterIdentifier != nil { + tfMap["db_cluster_identifier"] = aws.ToString(apiObject.DbClusterIdentifier) } - if config.Schema != nil { - result[names.AttrSchema] = aws.StringValue(config.Schema) + if apiObject.Schema != nil { + tfMap[names.AttrSchema] = aws.ToString(apiObject.Schema) } - return []map[string]interface{}{result} + return []interface{}{tfMap} } diff --git a/internal/service/appsync/datasource_test.go b/internal/service/appsync/datasource_test.go index 5f7e82abcda..e56e181944c 100644 --- a/internal/service/appsync/datasource_test.go +++ b/internal/service/appsync/datasource_test.go @@ -9,7 +9,6 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/service/appsync" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -27,7 +26,7 @@ func testAccDataSource_basic(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -64,7 +63,7 @@ func testAccDataSource_description(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -98,7 +97,7 @@ func testAccDataSource_DynamoDB_region(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -134,7 +133,7 @@ func testAccDataSource_DynamoDB_useCallerCredentials(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -171,7 +170,7 @@ func TestAccAppSyncDataSource_Elasticsearch_region(t *testing.T) { // Keep this test Parallel as it takes considerably longer to run than any non-Elasticsearch tests. resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -208,7 +207,7 @@ func TestAccAppSyncDataSource_OpenSearchService_region(t *testing.T) { // Keep this test Parallel as it takes considerably longer to run than any non-OpenSearchService tests. resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -244,7 +243,7 @@ func testAccDataSource_HTTP_endpoint(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -282,7 +281,7 @@ func testAccDataSource_type(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -313,7 +312,7 @@ func testAccDataSource_Type_dynamoDB(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -346,7 +345,7 @@ func TestAccAppSyncDataSource_Type_elasticSearch(t *testing.T) { // Keep this test Parallel as it takes considerably longer to run than any non-Elasticsearch tests. resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -379,7 +378,7 @@ func TestAccAppSyncDataSource_Type_openSearchService(t *testing.T) { // Keep this test Parallel as it takes considerably longer to run than any non-OpenSearchService tests. resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -410,7 +409,7 @@ func testAccDataSource_Type_http(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -439,7 +438,7 @@ func testAccDataSource_Type_httpAuth(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -473,7 +472,7 @@ func testAccDataSource_Type_relationalDatabase(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -502,7 +501,7 @@ func testAccDataSource_Type_relationalDatabaseWithOptions(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -535,7 +534,7 @@ func testAccDataSource_Type_lambda(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -567,7 +566,7 @@ func testAccDataSource_Type_eventBridge(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -597,7 +596,7 @@ func testAccDataSource_Type_none(t *testing.T) { resourceName := "aws_appsync_datasource.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDataSourceDestroy(ctx), @@ -620,19 +619,14 @@ func testAccDataSource_Type_none(t *testing.T) { func testAccCheckDataSourceDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_datasource" { continue } - apiID, name, err := tfappsync.DecodeID(rs.Primary.ID) - - if err != nil { - return err - } - - _, err = tfappsync.FindDataSourceByTwoPartKey(ctx, conn, apiID, name) + _, err := tfappsync.FindDataSourceByTwoPartKey(ctx, conn, rs.Primary.Attributes["api_id"], rs.Primary.Attributes[names.AttrName]) if tfresource.NotFound(err) { continue @@ -649,26 +643,16 @@ func testAccCheckDataSourceDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckExistsDataSource(ctx context.Context, name string) resource.TestCheckFunc { +func testAccCheckExistsDataSource(ctx context.Context, n string) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] + rs, ok := s.RootModule().Resources[n] if !ok { - return fmt.Errorf("Not found: %s", name) - } - - if rs.Primary.ID == "" { - return fmt.Errorf("No Appsync Data Source ID found: %s", name) - } - - apiID, name, err := tfappsync.DecodeID(rs.Primary.ID) - - if err != nil { - return err + return fmt.Errorf("Not found: %s", n) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) - _, err = tfappsync.FindDataSourceByTwoPartKey(ctx, conn, apiID, name) + _, err := tfappsync.FindDataSourceByTwoPartKey(ctx, conn, rs.Primary.Attributes["api_id"], rs.Primary.Attributes[names.AttrName]) return err } diff --git a/internal/service/appsync/exports_test.go b/internal/service/appsync/exports_test.go index bcdcadb675c..5476755ee92 100644 --- a/internal/service/appsync/exports_test.go +++ b/internal/service/appsync/exports_test.go @@ -5,9 +5,11 @@ package appsync // Exports for use in tests only. var ( - ResourceAPICache = resourceAPICache - ResourceAPIKey = resourceAPIKey + ResourceAPICache = resourceAPICache + ResourceAPIKey = resourceAPIKey + ResourceDataSource = resourceDataSource - FindAPICacheByID = findAPICacheByID - FindAPIKeyByTwoPartKey = findAPIKeyByTwoPartKey + FindAPICacheByID = findAPICacheByID + FindAPIKeyByTwoPartKey = findAPIKeyByTwoPartKey + FindDataSourceByTwoPartKey = findDataSourceByTwoPartKey ) diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index c01f1d2574b..dbdf31d1e08 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -40,8 +40,9 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePacka Name: "API Key", }, { - Factory: ResourceDataSource, + Factory: resourceDataSource, TypeName: "aws_appsync_datasource", + Name: "Data Source", }, { Factory: ResourceDomainName, From f928f467532c3ce9a764937bef3f13e6893b23fb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 19 Jun 2024 17:15:27 -0400 Subject: [PATCH 010/208] r/aws_appsync_domain_name: Migrate to AWS SDK for Go v2. --- internal/service/appsync/domain_name.go | 104 +++++++++++------- internal/service/appsync/domain_name_test.go | 77 ++++++------- internal/service/appsync/exports_test.go | 2 + internal/service/appsync/find.go | 24 ---- .../service/appsync/service_package_gen.go | 3 +- 5 files changed, 102 insertions(+), 108 deletions(-) diff --git a/internal/service/appsync/domain_name.go b/internal/service/appsync/domain_name.go index ea231219ed9..137f572ef18 100644 --- a/internal/service/appsync/domain_name.go +++ b/internal/service/appsync/domain_name.go @@ -5,30 +5,31 @@ package appsync import ( "context" - "fmt" "log" "time" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) -// @SDKResource("aws_appsync_domain_name") -func ResourceDomainName() *schema.Resource { +// @SDKResource("aws_appsync_domain_name", name="Domain Name") +func resourceDomainName() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceDomainNameCreate, ReadWithoutTimeout: resourceDomainNameRead, UpdateWithoutTimeout: resourceDomainNameUpdate, DeleteWithoutTimeout: resourceDomainNameDelete, + Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, @@ -63,63 +64,67 @@ func ResourceDomainName() *schema.Resource { func resourceDomainNameCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - params := &appsync.CreateDomainNameInput{ + domainName := d.Get(names.AttrDomainName).(string) + input := &appsync.CreateDomainNameInput{ CertificateArn: aws.String(d.Get(names.AttrCertificateARN).(string)), Description: aws.String(d.Get(names.AttrDescription).(string)), - DomainName: aws.String(d.Get(names.AttrDomainName).(string)), + DomainName: aws.String(domainName), } - resp, err := conn.CreateDomainNameWithContext(ctx, params) + output, err := conn.CreateDomainName(ctx, input) + if err != nil { - return sdkdiag.AppendErrorf(diags, "creating Appsync Domain Name: %s", err) + return sdkdiag.AppendErrorf(diags, "creating Appsync Domain Name (%s): %s", domainName, err) } - d.SetId(aws.StringValue(resp.DomainNameConfig.DomainName)) + d.SetId(aws.ToString(output.DomainNameConfig.DomainName)) return append(diags, resourceDomainNameRead(ctx, d, meta)...) } func resourceDomainNameRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - domainName, err := FindDomainNameByID(ctx, conn, d.Id()) - if domainName == nil && !d.IsNewResource() { + domainName, err := findDomainNameByID(ctx, conn, d.Id()) + + if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] AppSync Domain Name (%s) not found, removing from state", d.Id()) d.SetId("") return diags } if err != nil { - return sdkdiag.AppendErrorf(diags, "getting Appsync Domain Name %q: %s", d.Id(), err) + return sdkdiag.AppendErrorf(diags, "reading Appsync Domain Name (%s): %s", d.Id(), err) } - d.Set(names.AttrDomainName, domainName.DomainName) - d.Set(names.AttrDescription, domainName.Description) + d.Set("appsync_domain_name", domainName.AppsyncDomainName) d.Set(names.AttrCertificateARN, domainName.CertificateArn) + d.Set(names.AttrDescription, domainName.Description) + d.Set(names.AttrDomainName, domainName.DomainName) d.Set(names.AttrHostedZoneID, domainName.HostedZoneId) - d.Set("appsync_domain_name", domainName.AppsyncDomainName) return diags } func resourceDomainNameUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - params := &appsync.UpdateDomainNameInput{ + input := &appsync.UpdateDomainNameInput{ DomainName: aws.String(d.Id()), } if d.HasChange(names.AttrDescription) { - params.Description = aws.String(d.Get(names.AttrDescription).(string)) + input.Description = aws.String(d.Get(names.AttrDescription).(string)) } - _, err := conn.UpdateDomainNameWithContext(ctx, params) + _, err := conn.UpdateDomainName(ctx, input) + if err != nil { - return sdkdiag.AppendErrorf(diags, "updating Appsync Domain Name %q: %s", d.Id(), err) + return sdkdiag.AppendErrorf(diags, "updating Appsync Domain Name (%s): %s", d.Id(), err) } return append(diags, resourceDomainNameRead(ctx, d, meta)...) @@ -127,29 +132,46 @@ func resourceDomainNameUpdate(ctx context.Context, d *schema.ResourceData, meta func resourceDomainNameDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + + log.Printf("[INFO] Deleting Appsync Domain Name: %s", d.Id()) + const ( + timeout = 5 * time.Minute + ) + _, err := tfresource.RetryWhenIsA[*awstypes.ConcurrentModificationException](ctx, timeout, func() (interface{}, error) { + return conn.DeleteDomainName(ctx, &appsync.DeleteDomainNameInput{ + DomainName: aws.String(d.Id()), + }) + }) - input := &appsync.DeleteDomainNameInput{ - DomainName: aws.String(d.Id()), + if err != nil { + return sdkdiag.AppendErrorf(diags, "deleting Appsync Domain Name (%s): %s", d.Id(), err) } - err := retry.RetryContext(ctx, 5*time.Minute, func() *retry.RetryError { - _, err := conn.DeleteDomainNameWithContext(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeConcurrentModificationException) { - return retry.RetryableError(fmt.Errorf("deleting Appsync Domain Name %q: %w", d.Id(), err)) - } - if err != nil { - return retry.NonRetryableError(err) - } + return diags +} - return nil - }) - if tfresource.TimedOut(err) { - _, err = conn.DeleteDomainNameWithContext(ctx, input) +func findDomainNameByID(ctx context.Context, conn *appsync.Client, id string) (*awstypes.DomainNameConfig, error) { + input := &appsync.GetDomainNameInput{ + DomainName: aws.String(id), } + + output, err := conn.GetDomainName(ctx, input) + + if errs.IsA[*awstypes.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } + } + if err != nil { - return sdkdiag.AppendErrorf(diags, "deleting Appsync Domain Name %q: %s", d.Id(), err) + return nil, err } - return diags + if output == nil || output.DomainNameConfig == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output.DomainNameConfig, nil } diff --git a/internal/service/appsync/domain_name_test.go b/internal/service/appsync/domain_name_test.go index 4b28e443be8..82caf10328a 100644 --- a/internal/service/appsync/domain_name_test.go +++ b/internal/service/appsync/domain_name_test.go @@ -8,29 +8,27 @@ import ( "fmt" "testing" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) func testAccDomainName_basic(t *testing.T) { ctx := acctest.Context(t) - var domainName appsync.DomainNameConfig - appsyncCertDomain := getCertDomain(t) - + var domainName awstypes.DomainNameConfig + appsyncCertDomain := acctest.SkipIfEnvVarNotSet(t, "AWS_APPSYNC_DOMAIN_NAME_CERTIFICATE_DOMAIN") rName := sdkacctest.RandString(8) acmCertificateResourceName := "data.aws_acm_certificate.test" resourceName := "aws_appsync_domain_name.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameDestroy(ctx), @@ -54,14 +52,13 @@ func testAccDomainName_basic(t *testing.T) { func testAccDomainName_description(t *testing.T) { ctx := acctest.Context(t) - var domainName appsync.DomainNameConfig - appsyncCertDomain := getCertDomain(t) - + var domainName awstypes.DomainNameConfig + appsyncCertDomain := acctest.SkipIfEnvVarNotSet(t, "AWS_APPSYNC_DOMAIN_NAME_CERTIFICATE_DOMAIN") rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameDestroy(ctx), @@ -91,14 +88,13 @@ func testAccDomainName_description(t *testing.T) { func testAccDomainName_disappears(t *testing.T) { ctx := acctest.Context(t) - var domainName appsync.DomainNameConfig - appsyncCertDomain := getCertDomain(t) - + var domainName awstypes.DomainNameConfig + appsyncCertDomain := acctest.SkipIfEnvVarNotSet(t, "AWS_APPSYNC_DOMAIN_NAME_CERTIFICATE_DOMAIN") rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameDestroy(ctx), @@ -117,57 +113,54 @@ func testAccDomainName_disappears(t *testing.T) { func testAccCheckDomainNameDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_domain_name" { continue } - domainName, err := tfappsync.FindDomainNameByID(ctx, conn, rs.Primary.ID) - if err == nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { - return nil - } - return err + _, err := tfappsync.FindDomainNameByID(ctx, conn, rs.Primary.ID) + + if tfresource.NotFound(err) { + continue } - if domainName != nil && aws.StringValue(domainName.DomainName) == rs.Primary.ID { - return fmt.Errorf("Appsync Domain Name ID %q still exists", rs.Primary.ID) + if err != nil { + return err } - return nil + return fmt.Errorf("Appsync Domain Name %s still exists", rs.Primary.ID) } + return nil } } -func testAccCheckDomainNameExists(ctx context.Context, resourceName string, domainName *appsync.DomainNameConfig) resource.TestCheckFunc { +func testAccCheckDomainNameExists(ctx context.Context, n string, v *awstypes.DomainNameConfig) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] + rs, ok := s.RootModule().Resources[n] if !ok { - return fmt.Errorf("Appsync Domain Name Not found in state: %s", resourceName) + return fmt.Errorf("Not found: %s", n) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) - domain, err := tfappsync.FindDomainNameByID(ctx, conn, rs.Primary.ID) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + + output, err := tfappsync.FindDomainNameByID(ctx, conn, rs.Primary.ID) + if err != nil { return err } - if domain == nil || domain.DomainName == nil { - return fmt.Errorf("Appsync Domain Name %q not found", rs.Primary.ID) - } - - *domainName = *domain + *v = *output return nil } } -func testAccDomainNameBaseConfig(domain string) string { - return acctest.ConfigAlternateRegionProvider() + fmt.Sprintf(` +func testAccDomainNameConfig_base(domain string) string { + return fmt.Sprintf(` data "aws_acm_certificate" "test" { - provider = "awsalternate" domain = "*.%[1]s" most_recent = true } @@ -175,20 +168,20 @@ data "aws_acm_certificate" "test" { } func testAccDomainNameConfig_description(rName, domain, desc string) string { - return testAccDomainNameBaseConfig(domain) + fmt.Sprintf(` + return acctest.ConfigCompose(testAccDomainNameConfig_base(domain), fmt.Sprintf(` resource "aws_appsync_domain_name" "test" { domain_name = "%[2]s.%[1]s" certificate_arn = data.aws_acm_certificate.test.arn description = %[3]q } -`, domain, rName, desc) +`, domain, rName, desc)) } func testAccDomainNameConfig_basic(rName, domain string) string { - return testAccDomainNameBaseConfig(domain) + fmt.Sprintf(` + return acctest.ConfigCompose(testAccDomainNameConfig_base(domain), fmt.Sprintf(` resource "aws_appsync_domain_name" "test" { domain_name = "%[2]s.%[1]s" certificate_arn = data.aws_acm_certificate.test.arn } -`, domain, rName) +`, domain, rName)) } diff --git a/internal/service/appsync/exports_test.go b/internal/service/appsync/exports_test.go index 5476755ee92..219ec4100c6 100644 --- a/internal/service/appsync/exports_test.go +++ b/internal/service/appsync/exports_test.go @@ -8,8 +8,10 @@ var ( ResourceAPICache = resourceAPICache ResourceAPIKey = resourceAPIKey ResourceDataSource = resourceDataSource + ResourceDomainName = resourceDomainName FindAPICacheByID = findAPICacheByID FindAPIKeyByTwoPartKey = findAPIKeyByTwoPartKey FindDataSourceByTwoPartKey = findDataSourceByTwoPartKey + FindDomainNameByID = findDomainNameByID ) diff --git a/internal/service/appsync/find.go b/internal/service/appsync/find.go index fc7f708eef2..c1f694959bd 100644 --- a/internal/service/appsync/find.go +++ b/internal/service/appsync/find.go @@ -13,30 +13,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) -func FindDomainNameByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.DomainNameConfig, error) { - input := &appsync.GetDomainNameInput{ - DomainName: aws.String(id), - } - out, err := conn.GetDomainNameWithContext(ctx, input) - - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { - return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: input, - } - } - - if err != nil { - return nil, err - } - - if out == nil { - return nil, tfresource.NewEmptyResultError(input) - } - - return out.DomainNameConfig, nil -} - func FindDomainNameAPIAssociationByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.ApiAssociation, error) { input := &appsync.GetApiAssociationInput{ DomainName: aws.String(id), diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index dbdf31d1e08..305c46f3e02 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -45,8 +45,9 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePacka Name: "Data Source", }, { - Factory: ResourceDomainName, + Factory: resourceDomainName, TypeName: "aws_appsync_domain_name", + Name: "Domain Name", }, { Factory: ResourceDomainNameAPIAssociation, From bbe739b299105d93a032854d6c95598a759d289f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 19 Jun 2024 17:35:04 -0400 Subject: [PATCH 011/208] r/aws_appsync_domain_name_api_association: Migrate to AWS SDK for Go v2. --- internal/service/appsync/appsync_test.go | 13 -- .../appsync/domain_name_api_association.go | 164 ++++++++++++++---- .../domain_name_api_association_test.go | 55 +++--- internal/service/appsync/exports_test.go | 18 +- internal/service/appsync/find.go | 24 --- .../service/appsync/service_package_gen.go | 3 +- internal/service/appsync/status.go | 29 ---- internal/service/appsync/wait.go | 43 ----- 8 files changed, 168 insertions(+), 181 deletions(-) delete mode 100644 internal/service/appsync/status.go delete mode 100644 internal/service/appsync/wait.go diff --git a/internal/service/appsync/appsync_test.go b/internal/service/appsync/appsync_test.go index 16622c4122e..a25ca0d604e 100644 --- a/internal/service/appsync/appsync_test.go +++ b/internal/service/appsync/appsync_test.go @@ -4,7 +4,6 @@ package appsync_test import ( - "os" "testing" "github.com/hashicorp/terraform-provider-aws/internal/acctest" @@ -113,15 +112,3 @@ func TestAccAppSync_serial(t *testing.T) { acctest.RunSerialTests2Levels(t, testCases, 0) } - -func getCertDomain(t *testing.T) string { - value := os.Getenv("AWS_APPSYNC_DOMAIN_NAME_CERTIFICATE_DOMAIN") - if value == "" { - t.Skip( - "Environment variable AWS_APPSYNC_DOMAIN_NAME_CERTIFICATE_DOMAIN is not set. " + - "This environment variable must be set to any non-empty value " + - "to enable the test.") - } - - return value -} diff --git a/internal/service/appsync/domain_name_api_association.go b/internal/service/appsync/domain_name_api_association.go index dda172514f4..2baafc64ee4 100644 --- a/internal/service/appsync/domain_name_api_association.go +++ b/internal/service/appsync/domain_name_api_association.go @@ -5,25 +5,32 @@ package appsync import ( "context" + "errors" "log" + "time" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) -// @SDKResource("aws_appsync_domain_name_api_association") -func ResourceDomainNameAPIAssociation() *schema.Resource { +// @SDKResource("aws_appsync_domain_name_api_association", name="Domain Name API Association") +func resourceDomainNameAPIAssociation() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceDomainNameAPIAssociationCreate, ReadWithoutTimeout: resourceDomainNameAPIAssociationRead, UpdateWithoutTimeout: resourceDomainNameAPIAssociationUpdate, DeleteWithoutTimeout: resourceDomainNameAPIAssociationDelete, + Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, @@ -44,22 +51,24 @@ func ResourceDomainNameAPIAssociation() *schema.Resource { func resourceDomainNameAPIAssociationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - params := &appsync.AssociateApiInput{ + domainName := d.Get(names.AttrDomainName).(string) + input := &appsync.AssociateApiInput{ ApiId: aws.String(d.Get("api_id").(string)), - DomainName: aws.String(d.Get(names.AttrDomainName).(string)), + DomainName: aws.String(domainName), } - resp, err := conn.AssociateApiWithContext(ctx, params) + output, err := conn.AssociateApi(ctx, input) + if err != nil { - return sdkdiag.AppendErrorf(diags, "creating Appsync Domain Name API Association: %s", err) + return sdkdiag.AppendErrorf(diags, "creating Appsync Domain Name API Association (%s): %s", domainName, err) } - d.SetId(aws.StringValue(resp.ApiAssociation.DomainName)) + d.SetId(aws.ToString(output.ApiAssociation.DomainName)) - if err := waitDomainNameAPIAssociation(ctx, conn, d.Id()); err != nil { - return sdkdiag.AppendErrorf(diags, "waiting for Appsync Domain Name API (%s) Association: %s", d.Id(), err) + if _, err := waitDomainNameAPIAssociation(ctx, conn, d.Id()); err != nil { + return sdkdiag.AppendErrorf(diags, "waiting for Appsync Domain Name API Association (%s) create: %s", d.Id(), err) } return append(diags, resourceDomainNameAPIAssociationRead(ctx, d, meta)...) @@ -67,41 +76,43 @@ func resourceDomainNameAPIAssociationCreate(ctx context.Context, d *schema.Resou func resourceDomainNameAPIAssociationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) + + association, err := findDomainNameAPIAssociationByID(ctx, conn, d.Id()) - association, err := FindDomainNameAPIAssociationByID(ctx, conn, d.Id()) - if association == nil && !d.IsNewResource() { + if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] Appsync Domain Name API Association (%s) not found, removing from state", d.Id()) d.SetId("") return diags } if err != nil { - return sdkdiag.AppendErrorf(diags, "getting Appsync Domain Name API Association %q: %s", d.Id(), err) + return sdkdiag.AppendErrorf(diags, "reading Appsync Domain Name API Association (%s): %s", d.Id(), err) } - d.Set(names.AttrDomainName, association.DomainName) d.Set("api_id", association.ApiId) + d.Set(names.AttrDomainName, association.DomainName) return diags } func resourceDomainNameAPIAssociationUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - params := &appsync.AssociateApiInput{ + input := &appsync.AssociateApiInput{ ApiId: aws.String(d.Get("api_id").(string)), - DomainName: aws.String(d.Get(names.AttrDomainName).(string)), + DomainName: aws.String(d.Id()), } - _, err := conn.AssociateApiWithContext(ctx, params) + _, err := conn.AssociateApi(ctx, input) + if err != nil { - return sdkdiag.AppendErrorf(diags, "creating Appsync Domain Name API Association: %s", err) + return sdkdiag.AppendErrorf(diags, "updating Appsync Domain Name API Association (%s): %s", d.Id(), err) } - if err := waitDomainNameAPIAssociation(ctx, conn, d.Id()); err != nil { - return sdkdiag.AppendErrorf(diags, "waiting for Appsync Domain Name API (%s) Association: %s", d.Id(), err) + if _, err := waitDomainNameAPIAssociation(ctx, conn, d.Id()); err != nil { + return sdkdiag.AppendErrorf(diags, "waiting for Appsync Domain Name API Association (%s) update: %s", d.Id(), err) } return append(diags, resourceDomainNameAPIAssociationRead(ctx, d, meta)...) @@ -109,22 +120,107 @@ func resourceDomainNameAPIAssociationUpdate(ctx context.Context, d *schema.Resou func resourceDomainNameAPIAssociationDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - input := &appsync.DisassociateApiInput{ + log.Printf("[INFO] Deleting Appsync Domain Name API Association: %s", d.Id()) + _, err := conn.DisassociateApi(ctx, &appsync.DisassociateApiInput{ DomainName: aws.String(d.Id()), + }) + + if errs.IsA[*awstypes.NotFoundException](err) { + return diags } - _, err := conn.DisassociateApiWithContext(ctx, input) + if err != nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { - return diags - } - return sdkdiag.AppendErrorf(diags, "deleting Appsync Domain Name API Association: %s", err) + return sdkdiag.AppendErrorf(diags, "deleting Appsync Domain Name API Association (%s): %s", d.Id(), err) } - if err := waitDomainNameAPIDisassociation(ctx, conn, d.Id()); err != nil { - return sdkdiag.AppendErrorf(diags, "waiting for Appsync Domain Name API (%s) Disassociation: %s", d.Id(), err) + if _, err := waitDomainNameAPIDisassociation(ctx, conn, d.Id()); err != nil { + return sdkdiag.AppendErrorf(diags, "waiting for Appsync Domain Name API Association (%s) delete: %s", d.Id(), err) } return diags } + +func findDomainNameAPIAssociationByID(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiAssociation, error) { + input := &appsync.GetApiAssociationInput{ + DomainName: aws.String(id), + } + + output, err := conn.GetApiAssociation(ctx, input) + + if errs.IsA[*awstypes.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } + } + + if err != nil { + return nil, err + } + + if output == nil || output.ApiAssociation == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output.ApiAssociation, nil +} + +func statusDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, id string) retry.StateRefreshFunc { + return func() (interface{}, string, error) { + output, err := findDomainNameAPIAssociationByID(ctx, conn, id) + + if tfresource.NotFound(err) { + return nil, "", nil + } + + if err != nil { + return nil, "", err + } + + return output, string(output.AssociationStatus), nil + } +} + +func waitDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiAssociation, error) { + const ( + domainNameAPIAssociationTimeout = 60 * time.Minute + ) + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(awstypes.AssociationStatusProcessing), + Target: enum.Slice(awstypes.AssociationStatusSuccess), + Refresh: statusDomainNameAPIAssociation(ctx, conn, id), + Timeout: domainNameAPIAssociationTimeout, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + + if output, ok := outputRaw.(*awstypes.ApiAssociation); ok { + tfresource.SetLastError(err, errors.New(aws.ToString(output.DeploymentDetail))) + return output, err + } + + return nil, err +} + +func waitDomainNameAPIDisassociation(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiAssociation, error) { + const ( + timeout = 60 * time.Minute + ) + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(awstypes.AssociationStatusProcessing), + Target: []string{}, + Refresh: statusDomainNameAPIAssociation(ctx, conn, id), + Timeout: timeout, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + + if output, ok := outputRaw.(*awstypes.ApiAssociation); ok { + tfresource.SetLastError(err, errors.New(aws.ToString(output.DeploymentDetail))) + return output, err + } + + return nil, err +} diff --git a/internal/service/appsync/domain_name_api_association_test.go b/internal/service/appsync/domain_name_api_association_test.go index a85e62b4c70..f119e6deb47 100644 --- a/internal/service/appsync/domain_name_api_association_test.go +++ b/internal/service/appsync/domain_name_api_association_test.go @@ -8,28 +8,27 @@ import ( "fmt" "testing" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) func testAccDomainNameAPIAssociation_basic(t *testing.T) { ctx := acctest.Context(t) - var association appsync.ApiAssociation - appsyncCertDomain := getCertDomain(t) + var association awstypes.ApiAssociation + appsyncCertDomain := acctest.SkipIfEnvVarNotSet(t, "AWS_APPSYNC_DOMAIN_NAME_CERTIFICATE_DOMAIN") rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name_api_association.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameAPIAssociationDestroy(ctx), @@ -61,14 +60,14 @@ func testAccDomainNameAPIAssociation_basic(t *testing.T) { func testAccDomainNameAPIAssociation_disappears(t *testing.T) { ctx := acctest.Context(t) - var association appsync.ApiAssociation - appsyncCertDomain := getCertDomain(t) + var association awstypes.ApiAssociation + appsyncCertDomain := acctest.SkipIfEnvVarNotSet(t, "AWS_APPSYNC_DOMAIN_NAME_CERTIFICATE_DOMAIN") rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name_api_association.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), CheckDestroy: testAccCheckDomainNameAPIAssociationDestroy(ctx), @@ -87,48 +86,46 @@ func testAccDomainNameAPIAssociation_disappears(t *testing.T) { func testAccCheckDomainNameAPIAssociationDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_domain_name" { continue } - association, err := tfappsync.FindDomainNameAPIAssociationByID(ctx, conn, rs.Primary.ID) - if err == nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { - return nil - } - return err + _, err := tfappsync.FindDomainNameAPIAssociationByID(ctx, conn, rs.Primary.ID) + + if tfresource.NotFound(err) { + continue } - if association != nil && aws.StringValue(association.DomainName) == rs.Primary.ID { - return fmt.Errorf("Appsync Domain Name ID %q still exists", rs.Primary.ID) + if err != nil { + return err } - return nil + return fmt.Errorf("Appsync Domain Name API Association %s still exists", rs.Primary.ID) } + return nil } } -func testAccCheckDomainNameAPIAssociationExists(ctx context.Context, resourceName string, DomainNameAPIAssociation *appsync.ApiAssociation) resource.TestCheckFunc { +func testAccCheckDomainNameAPIAssociationExists(ctx context.Context, n string, v *awstypes.ApiAssociation) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] + rs, ok := s.RootModule().Resources[n] if !ok { - return fmt.Errorf("Appsync Domain Name Not found in state: %s", resourceName) + return fmt.Errorf("Not found: %s", n) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) - association, err := tfappsync.FindDomainNameAPIAssociationByID(ctx, conn, rs.Primary.ID) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + + output, err := tfappsync.FindDomainNameAPIAssociationByID(ctx, conn, rs.Primary.ID) + if err != nil { return err } - if association == nil || association.DomainName == nil { - return fmt.Errorf("Appsync Domain Name %q not found", rs.Primary.ID) - } - - *DomainNameAPIAssociation = *association + *v = *output return nil } diff --git a/internal/service/appsync/exports_test.go b/internal/service/appsync/exports_test.go index 219ec4100c6..d45a14ec66f 100644 --- a/internal/service/appsync/exports_test.go +++ b/internal/service/appsync/exports_test.go @@ -5,13 +5,15 @@ package appsync // Exports for use in tests only. var ( - ResourceAPICache = resourceAPICache - ResourceAPIKey = resourceAPIKey - ResourceDataSource = resourceDataSource - ResourceDomainName = resourceDomainName + ResourceAPICache = resourceAPICache + ResourceAPIKey = resourceAPIKey + ResourceDataSource = resourceDataSource + ResourceDomainName = resourceDomainName + ResourceDomainNameAPIAssociation = resourceDomainNameAPIAssociation - FindAPICacheByID = findAPICacheByID - FindAPIKeyByTwoPartKey = findAPIKeyByTwoPartKey - FindDataSourceByTwoPartKey = findDataSourceByTwoPartKey - FindDomainNameByID = findDomainNameByID + FindAPICacheByID = findAPICacheByID + FindAPIKeyByTwoPartKey = findAPIKeyByTwoPartKey + FindDataSourceByTwoPartKey = findDataSourceByTwoPartKey + FindDomainNameAPIAssociationByID = findDomainNameAPIAssociationByID + FindDomainNameByID = findDomainNameByID ) diff --git a/internal/service/appsync/find.go b/internal/service/appsync/find.go index c1f694959bd..08a947657a5 100644 --- a/internal/service/appsync/find.go +++ b/internal/service/appsync/find.go @@ -13,30 +13,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) -func FindDomainNameAPIAssociationByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.ApiAssociation, error) { - input := &appsync.GetApiAssociationInput{ - DomainName: aws.String(id), - } - out, err := conn.GetApiAssociationWithContext(ctx, input) - - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { - return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: input, - } - } - - if err != nil { - return nil, err - } - - if out == nil { - return nil, tfresource.NewEmptyResultError(input) - } - - return out.ApiAssociation, nil -} - func FindTypeByThreePartKey(ctx context.Context, conn *appsync.AppSync, apiID, format, name string) (*appsync.Type, error) { input := &appsync.GetTypeInput{ ApiId: aws.String(apiID), diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index 305c46f3e02..6c58f794bf9 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -50,8 +50,9 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePacka Name: "Domain Name", }, { - Factory: ResourceDomainNameAPIAssociation, + Factory: resourceDomainNameAPIAssociation, TypeName: "aws_appsync_domain_name_api_association", + Name: "Domain Name API Association", }, { Factory: ResourceFunction, diff --git a/internal/service/appsync/status.go b/internal/service/appsync/status.go deleted file mode 100644 index a0a4aae206a..00000000000 --- a/internal/service/appsync/status.go +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -package appsync - -import ( - "context" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" -) - -func statusDomainNameAPIAssociation(ctx context.Context, conn *appsync.AppSync, id string) retry.StateRefreshFunc { - return func() (interface{}, string, error) { - output, err := FindDomainNameAPIAssociationByID(ctx, conn, id) - - if tfresource.NotFound(err) { - return nil, "", nil - } - - if err != nil { - return nil, "", err - } - - return output, aws.StringValue(output.AssociationStatus), nil - } -} diff --git a/internal/service/appsync/wait.go b/internal/service/appsync/wait.go deleted file mode 100644 index 511f903aa21..00000000000 --- a/internal/service/appsync/wait.go +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -package appsync - -import ( - "context" - "time" - - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" -) - -const ( - domainNameAPIAssociationTimeout = 60 * time.Minute - domainNameAPIDisassociationTimeout = 60 * time.Minute -) - -func waitDomainNameAPIAssociation(ctx context.Context, conn *appsync.AppSync, id string) error { - stateConf := &retry.StateChangeConf{ - Pending: []string{appsync.AssociationStatusProcessing}, - Target: []string{appsync.AssociationStatusSuccess}, - Refresh: statusDomainNameAPIAssociation(ctx, conn, id), - Timeout: domainNameAPIAssociationTimeout, - } - - _, err := stateConf.WaitForStateContext(ctx) - - return err -} - -func waitDomainNameAPIDisassociation(ctx context.Context, conn *appsync.AppSync, id string) error { - stateConf := &retry.StateChangeConf{ - Pending: []string{appsync.AssociationStatusProcessing}, - Target: []string{}, - Refresh: statusDomainNameAPIAssociation(ctx, conn, id), - Timeout: domainNameAPIDisassociationTimeout, - } - - _, err := stateConf.WaitForStateContext(ctx) - - return err -} From 90bc90685ed206ddd737854efb316340528657cb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 07:58:35 -0400 Subject: [PATCH 012/208] r/aws_appsync_function: Migrate to AWS SDK for Go v2. --- .changelog/36568.txt | 2 +- internal/service/appsync/exports_test.go | 2 + internal/service/appsync/function.go | 271 ++++++++++-------- internal/service/appsync/function_test.go | 71 ++--- .../service/appsync/service_package_gen.go | 3 +- 5 files changed, 188 insertions(+), 161 deletions(-) diff --git a/.changelog/36568.txt b/.changelog/36568.txt index c1789bde97a..ac36dddd268 100644 --- a/.changelog/36568.txt +++ b/.changelog/36568.txt @@ -1,3 +1,3 @@ ```release-note:enhancement resource/aws_appsync_api_key: Add `api_key_id` attribute -``` \ No newline at end of file +``` diff --git a/internal/service/appsync/exports_test.go b/internal/service/appsync/exports_test.go index d45a14ec66f..40007c92955 100644 --- a/internal/service/appsync/exports_test.go +++ b/internal/service/appsync/exports_test.go @@ -10,10 +10,12 @@ var ( ResourceDataSource = resourceDataSource ResourceDomainName = resourceDomainName ResourceDomainNameAPIAssociation = resourceDomainNameAPIAssociation + ResourceFunction = resourceFunction FindAPICacheByID = findAPICacheByID FindAPIKeyByTwoPartKey = findAPIKeyByTwoPartKey FindDataSourceByTwoPartKey = findDataSourceByTwoPartKey FindDomainNameAPIAssociationByID = findDomainNameAPIAssociationByID FindDomainNameByID = findDomainNameByID + FindFunctionByTwoPartKey = findFunctionByTwoPartKey ) diff --git a/internal/service/appsync/function.go b/internal/service/appsync/function.go index 1007441b65c..4bf0e1a7c9f 100644 --- a/internal/service/appsync/function.go +++ b/internal/service/appsync/function.go @@ -10,20 +10,28 @@ import ( "strings" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) -// @SDKResource("aws_appsync_function") -func ResourceFunction() *schema.Resource { +const ( + functionVersion2018_05_29 = "2018-05-29" +) + +// @SDKResource("aws_appsync_function", name="Function") +func resourceFunction() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceFunctionCreate, ReadWithoutTimeout: resourceFunctionRead, @@ -67,7 +75,7 @@ func ResourceFunction() *schema.Resource { Optional: true, Computed: true, ValidateFunc: validation.StringInSlice([]string{ - "2018-05-29", + functionVersion2018_05_29, }, true), }, "max_batch_size": { @@ -96,9 +104,9 @@ func ResourceFunction() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ names.AttrName: { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.RuntimeName_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.RuntimeName](), }, "runtime_version": { Type: schema.TypeString, @@ -114,14 +122,14 @@ func ResourceFunction() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "conflict_detection": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice(appsync.ConflictDetectionType_Values(), false), + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.ConflictDetectionType](), }, "conflict_handler": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice(appsync.ConflictHandlerType_Values(), false), + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.ConflictHandlerType](), }, "lambda_conflict_handler_config": { Type: schema.TypeList, @@ -146,15 +154,15 @@ func ResourceFunction() *schema.Resource { func resourceFunctionCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID := d.Get("api_id").(string) - + name := d.Get(names.AttrName).(string) input := &appsync.CreateFunctionInput{ ApiId: aws.String(apiID), DataSourceName: aws.String(d.Get("data_source").(string)), FunctionVersion: aws.String(d.Get("function_version").(string)), - Name: aws.String(d.Get(names.AttrName).(string)), + Name: aws.String(name), } if v, ok := d.GetOk("code"); ok { @@ -165,92 +173,87 @@ func resourceFunctionCreate(ctx context.Context, d *schema.ResourceData, meta in input.Description = aws.String(v.(string)) } + if v, ok := d.GetOk("max_batch_size"); ok { + input.MaxBatchSize = int32(v.(int)) + } + if v, ok := d.GetOk("request_mapping_template"); ok { input.RequestMappingTemplate = aws.String(v.(string)) - input.FunctionVersion = aws.String("2018-05-29") + input.FunctionVersion = aws.String(functionVersion2018_05_29) } if v, ok := d.GetOk("response_mapping_template"); ok { input.ResponseMappingTemplate = aws.String(v.(string)) } - if v, ok := d.GetOkExists("max_batch_size"); ok { - input.MaxBatchSize = aws.Int64(int64(v.(int))) + if v, ok := d.GetOk("runtime"); ok && len(v.([]interface{})) > 0 { + input.Runtime = expandRuntime(v.([]interface{})) } if v, ok := d.GetOk("sync_config"); ok && len(v.([]interface{})) > 0 { input.SyncConfig = expandSyncConfig(v.([]interface{})) } - if v, ok := d.GetOk("runtime"); ok && len(v.([]interface{})) > 0 { - input.Runtime = expandRuntime(v.([]interface{})) - } + output, err := conn.CreateFunction(ctx, input) - resp, err := conn.CreateFunctionWithContext(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "creating AppSync Function: %s", err) } - d.SetId(fmt.Sprintf("%s-%s", apiID, aws.StringValue(resp.FunctionConfiguration.FunctionId))) + d.SetId(functionCreateResourceID(apiID, aws.ToString(output.FunctionConfiguration.FunctionId))) return append(diags, resourceFunctionRead(ctx, d, meta)...) } func resourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - apiID, functionID, err := DecodeFunctionID(d.Id()) + apiID, functionID, err := functionParseResourceID(d.Id()) if err != nil { - return sdkdiag.AppendErrorf(diags, "reading AppSync Function (%s): %s", d.Id(), err) + return sdkdiag.AppendFromErr(diags, err) } - input := &appsync.GetFunctionInput{ - ApiId: aws.String(apiID), - FunctionId: aws.String(functionID), - } + function, err := findFunctionByTwoPartKey(ctx, conn, apiID, functionID) - resp, err := conn.GetFunctionWithContext(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) && !d.IsNewResource() { + if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] AppSync Function (%s) not found, removing from state", d.Id()) d.SetId("") return diags } + if err != nil { - return sdkdiag.AppendErrorf(diags, "reading AppSync Function (%s): %s", d.Id(), err) + return sdkdiag.AppendErrorf(diags, "reading Appsync Function (%s): %s", d.Id(), err) } - function := resp.FunctionConfiguration d.Set("api_id", apiID) - d.Set("function_id", functionID) + d.Set(names.AttrARN, function.FunctionArn) + d.Set("code", function.Code) d.Set("data_source", function.DataSourceName) d.Set(names.AttrDescription, function.Description) - d.Set(names.AttrARN, function.FunctionArn) + d.Set("function_id", functionID) d.Set("function_version", function.FunctionVersion) + d.Set("max_batch_size", function.MaxBatchSize) d.Set(names.AttrName, function.Name) d.Set("request_mapping_template", function.RequestMappingTemplate) d.Set("response_mapping_template", function.ResponseMappingTemplate) - d.Set("max_batch_size", function.MaxBatchSize) - d.Set("code", function.Code) - - if err := d.Set("sync_config", flattenSyncConfig(function.SyncConfig)); err != nil { - return sdkdiag.AppendErrorf(diags, "setting sync_config: %s", err) - } - if err := d.Set("runtime", flattenRuntime(function.Runtime)); err != nil { return sdkdiag.AppendErrorf(diags, "setting runtime: %s", err) } + if err := d.Set("sync_config", flattenSyncConfig(function.SyncConfig)); err != nil { + return sdkdiag.AppendErrorf(diags, "setting sync_config: %s", err) + } return diags } func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - apiID, functionID, err := DecodeFunctionID(d.Id()) + apiID, functionID, err := functionParseResourceID(d.Id()) if err != nil { - return sdkdiag.AppendErrorf(diags, "updating AppSync Function (%s): %s", d.Id(), err) + return sdkdiag.AppendFromErr(diags, err) } input := &appsync.UpdateFunctionInput{ @@ -261,12 +264,16 @@ func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta in Name: aws.String(d.Get(names.AttrName).(string)), } + if v, ok := d.GetOk("code"); ok { + input.Code = aws.String(v.(string)) + } + if v, ok := d.GetOk(names.AttrDescription); ok { input.Description = aws.String(v.(string)) } - if v, ok := d.GetOk("code"); ok { - input.Code = aws.String(v.(string)) + if v, ok := d.GetOk("max_batch_size"); ok { + input.MaxBatchSize = int32(v.(int)) } if v, ok := d.GetOk("request_mapping_template"); ok { @@ -277,19 +284,16 @@ func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta in input.ResponseMappingTemplate = aws.String(v.(string)) } - if v, ok := d.GetOk("max_batch_size"); ok { - input.MaxBatchSize = aws.Int64(int64(v.(int))) + if v, ok := d.GetOk("runtime"); ok && len(v.([]interface{})) > 0 { + input.Runtime = expandRuntime(v.([]interface{})) } if v, ok := d.GetOk("sync_config"); ok && len(v.([]interface{})) > 0 { input.SyncConfig = expandSyncConfig(v.([]interface{})) } - if v, ok := d.GetOk("runtime"); ok && len(v.([]interface{})) > 0 { - input.Runtime = expandRuntime(v.([]interface{})) - } + _, err = conn.UpdateFunction(ctx, input) - _, err = conn.UpdateFunctionWithContext(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "updating AppSync Function (%s): %s", d.Id(), err) } @@ -299,22 +303,23 @@ func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta in func resourceFunctionDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - apiID, functionID, err := DecodeFunctionID(d.Id()) + apiID, functionID, err := functionParseResourceID(d.Id()) if err != nil { - return sdkdiag.AppendErrorf(diags, "deleting AppSync Function (%s): %s", d.Id(), err) + return sdkdiag.AppendFromErr(diags, err) } - input := &appsync.DeleteFunctionInput{ + log.Printf("[INFO] Deleting Appsync Function: %s", d.Id()) + _, err = conn.DeleteFunction(ctx, &appsync.DeleteFunctionInput{ ApiId: aws.String(apiID), FunctionId: aws.String(functionID), - } + }) - _, err = conn.DeleteFunctionWithContext(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return diags } + if err != nil { return sdkdiag.AppendErrorf(diags, "deleting AppSync Function (%s): %s", d.Id(), err) } @@ -322,109 +327,143 @@ func resourceFunctionDelete(ctx context.Context, d *schema.ResourceData, meta in return diags } -func DecodeFunctionID(id string) (string, string, error) { - idParts := strings.SplitN(id, "-", 2) - if len(idParts) != 2 { - return "", "", fmt.Errorf("expected ID in format ApiID-FunctionID, received: %s", id) +const functionResourceIDSeparator = "-" + +func functionCreateResourceID(apiID, functionID string) string { + parts := []string{apiID, functionID} + id := strings.Join(parts, functionResourceIDSeparator) + + return id +} + +func functionParseResourceID(id string) (string, string, error) { + parts := strings.SplitN(id, functionResourceIDSeparator, 2) + + if len(parts) != 2 || parts[0] == "" || parts[1] == "" { + return "", "", fmt.Errorf("unexpected format for ID (%[1]s), expected API-ID%[2]sFUNCTION-ID", id, functionResourceIDSeparator) } - return idParts[0], idParts[1], nil + + return parts[0], parts[1], nil } -func expandRuntime(l []interface{}) *appsync.AppSyncRuntime { - if len(l) == 0 || l[0] == nil { - return nil +func findFunctionByTwoPartKey(ctx context.Context, conn *appsync.Client, apiID, functionID string) (*awstypes.FunctionConfiguration, error) { + input := &appsync.GetFunctionInput{ + ApiId: aws.String(apiID), + FunctionId: aws.String(functionID), } - configured := l[0].(map[string]interface{}) + output, err := conn.GetFunction(ctx, input) - result := &appsync.AppSyncRuntime{} + if errs.IsA[*awstypes.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } + } - if v, ok := configured[names.AttrName].(string); ok { - result.Name = aws.String(v) + if err != nil { + return nil, err } - if v, ok := configured["runtime_version"].(string); ok { - result.RuntimeVersion = aws.String(v) + if output == nil || output.FunctionConfiguration == nil { + return nil, tfresource.NewEmptyResultError(input) } - return result + return output.FunctionConfiguration, nil } -func flattenRuntime(config *appsync.AppSyncRuntime) []map[string]interface{} { - if config == nil { +func expandRuntime(tfList []interface{}) *awstypes.AppSyncRuntime { + if len(tfList) == 0 || tfList[0] == nil { return nil } - result := map[string]interface{}{ - names.AttrName: aws.StringValue(config.Name), - "runtime_version": aws.StringValue(config.RuntimeVersion), + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.AppSyncRuntime{} + + if v, ok := tfMap[names.AttrName].(string); ok { + apiObject.Name = awstypes.RuntimeName(v) + } + + if v, ok := tfMap["runtime_version"].(string); ok { + apiObject.RuntimeVersion = aws.String(v) } - return []map[string]interface{}{result} + return apiObject } -func expandSyncConfig(l []interface{}) *appsync.SyncConfig { - if len(l) == 0 || l[0] == nil { +func flattenRuntime(apiObject *awstypes.AppSyncRuntime) []interface{} { + if apiObject == nil { return nil } - configured := l[0].(map[string]interface{}) + tfMap := map[string]interface{}{ + names.AttrName: apiObject.Name, + "runtime_version": aws.ToString(apiObject.RuntimeVersion), + } - result := &appsync.SyncConfig{} + return []interface{}{tfMap} +} - if v, ok := configured["conflict_detection"].(string); ok { - result.ConflictDetection = aws.String(v) +func expandSyncConfig(tfList []interface{}) *awstypes.SyncConfig { + if len(tfList) == 0 || tfList[0] == nil { + return nil } - if v, ok := configured["conflict_handler"].(string); ok { - result.ConflictHandler = aws.String(v) + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.SyncConfig{} + + if v, ok := tfMap["conflict_detection"].(string); ok { + apiObject.ConflictDetection = awstypes.ConflictDetectionType(v) + } + + if v, ok := tfMap["conflict_handler"].(string); ok { + apiObject.ConflictHandler = awstypes.ConflictHandlerType(v) } - if v, ok := configured["lambda_conflict_handler_config"].([]interface{}); ok && len(v) > 0 { - result.LambdaConflictHandlerConfig = expandLambdaConflictHandlerConfig(v) + if v, ok := tfMap["lambda_conflict_handler_config"].([]interface{}); ok && len(v) > 0 { + apiObject.LambdaConflictHandlerConfig = expandLambdaConflictHandlerConfig(v) } - return result + return apiObject } -func flattenSyncConfig(config *appsync.SyncConfig) []map[string]interface{} { - if config == nil { +func flattenSyncConfig(apiObject *awstypes.SyncConfig) []interface{} { + if apiObject == nil { return nil } - result := map[string]interface{}{ - "conflict_detection": aws.StringValue(config.ConflictDetection), - "conflict_handler": aws.StringValue(config.ConflictHandler), - "lambda_conflict_handler_config": flattenLambdaConflictHandlerConfig(config.LambdaConflictHandlerConfig), + tfMap := map[string]interface{}{ + "conflict_detection": apiObject.ConflictDetection, + "conflict_handler": apiObject.ConflictHandler, + "lambda_conflict_handler_config": flattenLambdaConflictHandlerConfig(apiObject.LambdaConflictHandlerConfig), } - return []map[string]interface{}{result} + return []interface{}{tfMap} } -func expandLambdaConflictHandlerConfig(l []interface{}) *appsync.LambdaConflictHandlerConfig { - if len(l) == 0 || l[0] == nil { +func expandLambdaConflictHandlerConfig(tfList []interface{}) *awstypes.LambdaConflictHandlerConfig { + if len(tfList) == 0 || tfList[0] == nil { return nil } - configured := l[0].(map[string]interface{}) - - result := &appsync.LambdaConflictHandlerConfig{} + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.LambdaConflictHandlerConfig{} - if v, ok := configured["lambda_conflict_handler_arn"].(string); ok { - result.LambdaConflictHandlerArn = aws.String(v) + if v, ok := tfMap["lambda_conflict_handler_arn"].(string); ok { + apiObject.LambdaConflictHandlerArn = aws.String(v) } - return result + return apiObject } -func flattenLambdaConflictHandlerConfig(config *appsync.LambdaConflictHandlerConfig) []map[string]interface{} { - if config == nil { +func flattenLambdaConflictHandlerConfig(apiObject *awstypes.LambdaConflictHandlerConfig) []interface{} { + if apiObject == nil { return nil } - result := map[string]interface{}{ - "lambda_conflict_handler_arn": aws.StringValue(config.LambdaConflictHandlerArn), + tfMap := map[string]interface{}{ + "lambda_conflict_handler_arn": aws.ToString(apiObject.LambdaConflictHandlerArn), } - return []map[string]interface{}{result} + return []interface{}{tfMap} } diff --git a/internal/service/appsync/function_test.go b/internal/service/appsync/function_test.go index 193e5734725..64077312e8a 100644 --- a/internal/service/appsync/function_test.go +++ b/internal/service/appsync/function_test.go @@ -9,15 +9,14 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -27,10 +26,10 @@ func testAccFunction_basic(t *testing.T) { rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) rName3 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config appsync.FunctionConfiguration + var config awstypes.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -70,10 +69,10 @@ func testAccFunction_code(t *testing.T) { rName1 := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config appsync.FunctionConfiguration + var config awstypes.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -113,10 +112,10 @@ func testAccFunction_syncConfig(t *testing.T) { ctx := acctest.Context(t) rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_function.test" - var config appsync.FunctionConfiguration + var config awstypes.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -144,10 +143,10 @@ func testAccFunction_description(t *testing.T) { rName1 := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config appsync.FunctionConfiguration + var config awstypes.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -180,10 +179,10 @@ func testAccFunction_responseMappingTemplate(t *testing.T) { rName1 := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config appsync.FunctionConfiguration + var config awstypes.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -208,10 +207,10 @@ func testAccFunction_disappears(t *testing.T) { rName1 := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) rName2 := fmt.Sprintf("tfexample%s", sdkacctest.RandString(8)) resourceName := "aws_appsync_function.test" - var config appsync.FunctionConfiguration + var config awstypes.FunctionConfiguration resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(ctx), @@ -230,60 +229,46 @@ func testAccFunction_disappears(t *testing.T) { func testAccCheckFunctionDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_function" { continue } - apiID, functionID, err := tfappsync.DecodeFunctionID(rs.Primary.ID) - if err != nil { - return err - } + _, err := tfappsync.FindFunctionByTwoPartKey(ctx, conn, rs.Primary.Attributes["api_id"], rs.Primary.Attributes["function_id"]) - input := &appsync.GetFunctionInput{ - ApiId: aws.String(apiID), - FunctionId: aws.String(functionID), + if tfresource.NotFound(err) { + continue } - _, err = conn.GetFunctionWithContext(ctx, input) if err != nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { - return nil - } return err } + + return fmt.Errorf("Appsync Function %s still exists", rs.Primary.ID) } + return nil } } -func testAccCheckFunctionExists(ctx context.Context, name string, config *appsync.FunctionConfiguration) resource.TestCheckFunc { +func testAccCheckFunctionExists(ctx context.Context, n string, v *awstypes.FunctionConfiguration) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] + rs, ok := s.RootModule().Resources[n] if !ok { - return fmt.Errorf("Not found: %s", name) + return fmt.Errorf("Not found: %s", n) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) - - apiID, functionID, err := tfappsync.DecodeFunctionID(rs.Primary.ID) - if err != nil { - return err - } - - input := &appsync.GetFunctionInput{ - ApiId: aws.String(apiID), - FunctionId: aws.String(functionID), - } + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) - output, err := conn.GetFunctionWithContext(ctx, input) + output, err := tfappsync.FindFunctionByTwoPartKey(ctx, conn, rs.Primary.Attributes["api_id"], rs.Primary.Attributes["function_id"]) if err != nil { return err } - *config = *output.FunctionConfiguration + *v = *output return nil } diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index 6c58f794bf9..59dc4cfc60a 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -55,8 +55,9 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePacka Name: "Domain Name API Association", }, { - Factory: ResourceFunction, + Factory: resourceFunction, TypeName: "aws_appsync_function", + Name: "Function", }, { Factory: ResourceGraphQLAPI, From 6a61917fb12a359ca9f41f92372c2e0069ee8893 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 08:27:05 -0400 Subject: [PATCH 013/208] r/aws_appsync_graphql_api: Migrate to AWS SDK for Go v2. --- internal/service/appsync/exports_test.go | 15 +- internal/service/appsync/graphql_api.go | 459 +++++++++--------- internal/service/appsync/graphql_api_test.go | 153 +++--- .../service/appsync/service_package_gen.go | 2 +- 4 files changed, 308 insertions(+), 321 deletions(-) diff --git a/internal/service/appsync/exports_test.go b/internal/service/appsync/exports_test.go index 40007c92955..605a8e0e4f3 100644 --- a/internal/service/appsync/exports_test.go +++ b/internal/service/appsync/exports_test.go @@ -11,11 +11,14 @@ var ( ResourceDomainName = resourceDomainName ResourceDomainNameAPIAssociation = resourceDomainNameAPIAssociation ResourceFunction = resourceFunction + ResourceGraphQLAPI = resourceGraphQLAPI - FindAPICacheByID = findAPICacheByID - FindAPIKeyByTwoPartKey = findAPIKeyByTwoPartKey - FindDataSourceByTwoPartKey = findDataSourceByTwoPartKey - FindDomainNameAPIAssociationByID = findDomainNameAPIAssociationByID - FindDomainNameByID = findDomainNameByID - FindFunctionByTwoPartKey = findFunctionByTwoPartKey + DefaultAuthorizerResultTTLInSeconds = defaultAuthorizerResultTTLInSeconds + FindAPICacheByID = findAPICacheByID + FindAPIKeyByTwoPartKey = findAPIKeyByTwoPartKey + FindDataSourceByTwoPartKey = findDataSourceByTwoPartKey + FindDomainNameAPIAssociationByID = findDomainNameAPIAssociationByID + FindDomainNameByID = findDomainNameByID + FindFunctionByTwoPartKey = findFunctionByTwoPartKey + FindGraphQLAPIByID = findGraphQLAPIByID ) diff --git a/internal/service/appsync/graphql_api.go b/internal/service/appsync/graphql_api.go index 005f8f6c637..f5cc5f6315c 100644 --- a/internal/service/appsync/graphql_api.go +++ b/internal/service/appsync/graphql_api.go @@ -11,14 +11,16 @@ import ( "time" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -26,13 +28,15 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -var validateAuthorizerResultTTLInSeconds = validation.IntBetween(0, 3600) - -const DefaultAuthorizerResultTTLInSeconds = 300 +const ( + defaultAuthorizerResultTTLInSeconds = 300 +) // @SDKResource("aws_appsync_graphql_api", name="GraphQL API") // @Tags(identifierAttribute="arn") -func ResourceGraphQLAPI() *schema.Resource { +func resourceGraphQLAPI() *schema.Resource { + validateAuthorizerResultTTLInSeconds := validation.IntBetween(0, 3600) + return &schema.Resource{ CreateWithoutTimeout: resourceGraphQLAPICreate, ReadWithoutTimeout: resourceGraphQLAPIRead, @@ -50,9 +54,9 @@ func ResourceGraphQLAPI() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "authentication_type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.AuthenticationType_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.AuthenticationType](), }, "lambda_authorizer_config": { Type: schema.TypeList, @@ -63,7 +67,7 @@ func ResourceGraphQLAPI() *schema.Resource { "authorizer_result_ttl_in_seconds": { Type: schema.TypeInt, Optional: true, - Default: DefaultAuthorizerResultTTLInSeconds, + Default: defaultAuthorizerResultTTLInSeconds, ValidateFunc: validateAuthorizerResultTTLInSeconds, }, "authorizer_uri": { @@ -132,15 +136,15 @@ func ResourceGraphQLAPI() *schema.Resource { Computed: true, }, "authentication_type": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.AuthenticationType_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.AuthenticationType](), }, "introspection_config": { - Type: schema.TypeString, - Optional: true, - Default: appsync.GraphQLApiIntrospectionConfigEnabled, - ValidateFunc: validation.StringInSlice(appsync.GraphQLApiIntrospectionConfig_Values(), false), + Type: schema.TypeString, + Optional: true, + Default: awstypes.GraphQLApiIntrospectionConfigEnabled, + ValidateDiagFunc: enum.Validate[awstypes.GraphQLApiIntrospectionConfig](), }, "lambda_authorizer_config": { Type: schema.TypeList, @@ -151,7 +155,7 @@ func ResourceGraphQLAPI() *schema.Resource { "authorizer_result_ttl_in_seconds": { Type: schema.TypeInt, Optional: true, - Default: DefaultAuthorizerResultTTLInSeconds, + Default: defaultAuthorizerResultTTLInSeconds, ValidateFunc: validateAuthorizerResultTTLInSeconds, }, "authorizer_uri": { @@ -182,23 +186,17 @@ func ResourceGraphQLAPI() *schema.Resource { Default: false, }, "field_log_level": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.FieldLogLevel_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.FieldLogLevel](), }, }, }, }, names.AttrName: { - Type: schema.TypeString, - Required: true, - ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) { - value := v.(string) - if !regexache.MustCompile(`[A-Za-z_][0-9A-Za-z_]*`).MatchString(value) { - errors = append(errors, fmt.Errorf("%q must match [A-Za-z_][0-9A-Za-z_]*", k)) - } - return - }, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringMatch(regexache.MustCompile(`[A-Za-z_][0-9A-Za-z_]*`), ""), }, "openid_connect_config": { Type: schema.TypeList, @@ -264,9 +262,9 @@ func ResourceGraphQLAPI() *schema.Resource { Computed: true, }, names.AttrDefaultAction: { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.DefaultAction_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.DefaultAction](), }, names.AttrUserPoolID: { Type: schema.TypeString, @@ -276,11 +274,11 @@ func ResourceGraphQLAPI() *schema.Resource { }, }, "visibility": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - Default: appsync.GraphQLApiVisibilityGlobal, - ValidateFunc: validation.StringInSlice(appsync.GraphQLApiVisibility_Values(), false), + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Default: awstypes.GraphQLApiVisibilityGlobal, + ValidateDiagFunc: enum.Validate[awstypes.GraphQLApiVisibility](), }, "xray_enabled": { Type: schema.TypeBool, @@ -294,62 +292,62 @@ func ResourceGraphQLAPI() *schema.Resource { func resourceGraphQLAPICreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) name := d.Get(names.AttrName).(string) input := &appsync.CreateGraphqlApiInput{ - AuthenticationType: aws.String(d.Get("authentication_type").(string)), + AuthenticationType: awstypes.AuthenticationType(d.Get("authentication_type").(string)), Name: aws.String(name), Tags: getTagsIn(ctx), } if v, ok := d.GetOk("additional_authentication_provider"); ok { - input.AdditionalAuthenticationProviders = expandGraphQLAPIAdditionalAuthProviders(v.([]interface{}), meta.(*conns.AWSClient).Region) + input.AdditionalAuthenticationProviders = expandAdditionalAuthenticationProviders(v.([]interface{}), meta.(*conns.AWSClient).Region) + } + + if v, ok := d.GetOk("introspection_config"); ok { + input.IntrospectionConfig = awstypes.GraphQLApiIntrospectionConfig(v.(string)) } if v, ok := d.GetOk("lambda_authorizer_config"); ok { - input.LambdaAuthorizerConfig = expandGraphQLAPILambdaAuthorizerConfig(v.([]interface{})) + input.LambdaAuthorizerConfig = expandLambdaAuthorizerConfig(v.([]interface{})) } if v, ok := d.GetOk("log_config"); ok { - input.LogConfig = expandGraphQLAPILogConfig(v.([]interface{})) + input.LogConfig = expandLogConfig(v.([]interface{})) } if v, ok := d.GetOk("openid_connect_config"); ok { - input.OpenIDConnectConfig = expandGraphQLAPIOpenIDConnectConfig(v.([]interface{})) - } - - if v, ok := d.GetOk("user_pool_config"); ok { - input.UserPoolConfig = expandGraphQLAPIUserPoolConfig(v.([]interface{}), meta.(*conns.AWSClient).Region) - } - - if v, ok := d.GetOk("introspection_config"); ok { - input.IntrospectionConfig = aws.String(v.(string)) + input.OpenIDConnectConfig = expandOpenIDConnectConfig(v.([]interface{})) } if v, ok := d.GetOk("query_depth_limit"); ok { - input.QueryDepthLimit = aws.Int64(int64(v.(int))) + input.QueryDepthLimit = int32(v.(int)) } if v, ok := d.GetOk("resolver_count_limit"); ok { - input.ResolverCountLimit = aws.Int64(int64(v.(int))) + input.ResolverCountLimit = int32(v.(int)) + } + + if v, ok := d.GetOk("user_pool_config"); ok { + input.UserPoolConfig = expandUserPoolConfig(v.([]interface{}), meta.(*conns.AWSClient).Region) } if v, ok := d.GetOk("xray_enabled"); ok { - input.XrayEnabled = aws.Bool(v.(bool)) + input.XrayEnabled = v.(bool) } if v, ok := d.GetOk("visibility"); ok { - input.Visibility = aws.String(v.(string)) + input.Visibility = awstypes.GraphQLApiVisibility(v.(string)) } - output, err := conn.CreateGraphqlApiWithContext(ctx, input) + output, err := conn.CreateGraphqlApi(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "creating AppSync GraphQL API (%s): %s", name, err) } - d.SetId(aws.StringValue(output.GraphqlApi.ApiId)) + d.SetId(aws.ToString(output.GraphqlApi.ApiId)) if v, ok := d.GetOk(names.AttrSchema); ok { if err := putSchema(ctx, conn, d.Id(), v.(string), d.Timeout(schema.TimeoutCreate)); err != nil { @@ -362,9 +360,9 @@ func resourceGraphQLAPICreate(ctx context.Context, d *schema.ResourceData, meta func resourceGraphQLAPIRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - api, err := FindGraphQLAPIByID(ctx, conn, d.Id()) + api, err := findGraphQLAPIByID(ctx, conn, d.Id()) if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] AppSync GraphQL API (%s) not found, removing from state", d.Id()) @@ -376,32 +374,30 @@ func resourceGraphQLAPIRead(ctx context.Context, d *schema.ResourceData, meta in return sdkdiag.AppendErrorf(diags, "reading AppSync GraphQL API (%s): %s", d.Id(), err) } - if err := d.Set("additional_authentication_provider", flattenGraphQLAPIAdditionalAuthenticationProviders(api.AdditionalAuthenticationProviders)); err != nil { + if err := d.Set("additional_authentication_provider", flattenAdditionalAuthenticationProviders(api.AdditionalAuthenticationProviders)); err != nil { return sdkdiag.AppendErrorf(diags, "setting additional_authentication_provider: %s", err) } d.Set(names.AttrARN, api.Arn) d.Set("authentication_type", api.AuthenticationType) - if err := d.Set("lambda_authorizer_config", flattenGraphQLAPILambdaAuthorizerConfig(api.LambdaAuthorizerConfig)); err != nil { + d.Set("introspection_config", api.IntrospectionConfig) + if err := d.Set("lambda_authorizer_config", flattenLambdaAuthorizerConfig(api.LambdaAuthorizerConfig)); err != nil { return sdkdiag.AppendErrorf(diags, "setting lambda_authorizer_config: %s", err) } - if err := d.Set("log_config", flattenGraphQLAPILogConfig(api.LogConfig)); err != nil { + if err := d.Set("log_config", flattenLogConfig(api.LogConfig)); err != nil { return sdkdiag.AppendErrorf(diags, "setting log_config: %s", err) } - if err := d.Set("openid_connect_config", flattenGraphQLAPIOpenIDConnectConfig(api.OpenIDConnectConfig)); err != nil { + d.Set(names.AttrName, api.Name) + if err := d.Set("openid_connect_config", flattenOpenIDConnectConfig(api.OpenIDConnectConfig)); err != nil { return sdkdiag.AppendErrorf(diags, "setting openid_connect_config: %s", err) } - d.Set("introspection_config", api.IntrospectionConfig) - d.Set(names.AttrName, api.Name) d.Set("query_depth_limit", api.QueryDepthLimit) d.Set("resolver_count_limit", api.ResolverCountLimit) - d.Set("uris", aws.StringValueMap(api.Uris)) - if err := d.Set("user_pool_config", flattenGraphQLAPIUserPoolConfig(api.UserPoolConfig)); err != nil { + d.Set("uris", api.Uris) + if err := d.Set("user_pool_config", flattenUserPoolConfig(api.UserPoolConfig)); err != nil { return sdkdiag.AppendErrorf(diags, "setting user_pool_config: %s", err) } d.Set("visibility", api.Visibility) - if err := d.Set("xray_enabled", api.XrayEnabled); err != nil { - return sdkdiag.AppendErrorf(diags, "setting xray_enabled: %s", err) - } + d.Set("xray_enabled", api.XrayEnabled) setTagsOut(ctx, api.Tags) @@ -410,52 +406,52 @@ func resourceGraphQLAPIRead(ctx context.Context, d *schema.ResourceData, meta in func resourceGraphQLAPIUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) if d.HasChangesExcept(names.AttrTags, names.AttrTagsAll) { input := &appsync.UpdateGraphqlApiInput{ ApiId: aws.String(d.Id()), - AuthenticationType: aws.String(d.Get("authentication_type").(string)), + AuthenticationType: awstypes.AuthenticationType(d.Get("authentication_type").(string)), Name: aws.String(d.Get(names.AttrName).(string)), } if v, ok := d.GetOk("additional_authentication_provider"); ok { - input.AdditionalAuthenticationProviders = expandGraphQLAPIAdditionalAuthProviders(v.([]interface{}), meta.(*conns.AWSClient).Region) + input.AdditionalAuthenticationProviders = expandAdditionalAuthenticationProviders(v.([]interface{}), meta.(*conns.AWSClient).Region) + } + + if v, ok := d.GetOk("introspection_config"); ok { + input.IntrospectionConfig = awstypes.GraphQLApiIntrospectionConfig(v.(string)) } if v, ok := d.GetOk("lambda_authorizer_config"); ok { - input.LambdaAuthorizerConfig = expandGraphQLAPILambdaAuthorizerConfig(v.([]interface{})) + input.LambdaAuthorizerConfig = expandLambdaAuthorizerConfig(v.([]interface{})) } if v, ok := d.GetOk("log_config"); ok { - input.LogConfig = expandGraphQLAPILogConfig(v.([]interface{})) + input.LogConfig = expandLogConfig(v.([]interface{})) } if v, ok := d.GetOk("openid_connect_config"); ok { - input.OpenIDConnectConfig = expandGraphQLAPIOpenIDConnectConfig(v.([]interface{})) - } - - if v, ok := d.GetOk("user_pool_config"); ok { - input.UserPoolConfig = expandGraphQLAPIUserPoolConfig(v.([]interface{}), meta.(*conns.AWSClient).Region) - } - - if v, ok := d.GetOk("introspection_config"); ok { - input.IntrospectionConfig = aws.String(v.(string)) + input.OpenIDConnectConfig = expandOpenIDConnectConfig(v.([]interface{})) } if v, ok := d.GetOk("query_depth_limit"); ok { - input.QueryDepthLimit = aws.Int64(int64(v.(int))) + input.QueryDepthLimit = int32(v.(int)) } if v, ok := d.GetOk("resolver_count_limit"); ok { - input.ResolverCountLimit = aws.Int64(int64(v.(int))) + input.ResolverCountLimit = int32(v.(int)) + } + + if v, ok := d.GetOk("user_pool_config"); ok { + input.UserPoolConfig = expandUserPoolConfig(v.([]interface{}), meta.(*conns.AWSClient).Region) } if v, ok := d.GetOk("xray_enabled"); ok { - input.XrayEnabled = aws.Bool(v.(bool)) + input.XrayEnabled = v.(bool) } - _, err := conn.UpdateGraphqlApiWithContext(ctx, input) + _, err := conn.UpdateGraphqlApi(ctx, input) if err != nil { return sdkdiag.AppendErrorf(diags, "updating AppSync GraphQL API (%s): %s", d.Id(), err) @@ -463,7 +459,7 @@ func resourceGraphQLAPIUpdate(ctx context.Context, d *schema.ResourceData, meta if d.HasChange(names.AttrSchema) { if v, ok := d.GetOk(names.AttrSchema); ok { - if err := putSchema(ctx, conn, d.Id(), v.(string), d.Timeout(schema.TimeoutCreate)); err != nil { + if err := putSchema(ctx, conn, d.Id(), v.(string), d.Timeout(schema.TimeoutUpdate)); err != nil { return sdkdiag.AppendFromErr(diags, err) } } @@ -475,14 +471,14 @@ func resourceGraphQLAPIUpdate(ctx context.Context, d *schema.ResourceData, meta func resourceGraphQLAPIDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) log.Printf("[DEBUG] Deleting AppSync GraphQL API: %s", d.Id()) - _, err := conn.DeleteGraphqlApiWithContext(ctx, &appsync.DeleteGraphqlApiInput{ + _, err := conn.DeleteGraphqlApi(ctx, &appsync.DeleteGraphqlApiInput{ ApiId: aws.String(d.Id()), }) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return diags } @@ -493,33 +489,33 @@ func resourceGraphQLAPIDelete(ctx context.Context, d *schema.ResourceData, meta return diags } -func putSchema(ctx context.Context, conn *appsync.AppSync, apiID, definition string, timeout time.Duration) error { +func putSchema(ctx context.Context, conn *appsync.Client, apiID, definition string, timeout time.Duration) error { input := &appsync.StartSchemaCreationInput{ ApiId: aws.String(apiID), Definition: ([]byte)(definition), } - _, err := conn.StartSchemaCreationWithContext(ctx, input) + _, err := conn.StartSchemaCreation(ctx, input) if err != nil { return fmt.Errorf("creating AppSync GraphQL API (%s) schema: %w", apiID, err) } - if err := waitSchemaCreated(ctx, conn, apiID, timeout); err != nil { + if _, err := waitSchemaCreated(ctx, conn, apiID, timeout); err != nil { return fmt.Errorf("waiting for AppSync GraphQL API (%s) schema create: %w", apiID, err) } return nil } -func FindGraphQLAPIByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.GraphqlApi, error) { +func findGraphQLAPIByID(ctx context.Context, conn *appsync.Client, id string) (*awstypes.GraphqlApi, error) { input := &appsync.GetGraphqlApiInput{ ApiId: aws.String(id), } - output, err := conn.GetGraphqlApiWithContext(ctx, input) + output, err := conn.GetGraphqlApi(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -537,14 +533,14 @@ func FindGraphQLAPIByID(ctx context.Context, conn *appsync.AppSync, id string) ( return output.GraphqlApi, nil } -func findSchemaCreationStatusByID(ctx context.Context, conn *appsync.AppSync, id string) (*appsync.GetSchemaCreationStatusOutput, error) { +func findSchemaCreationStatusByID(ctx context.Context, conn *appsync.Client, id string) (*appsync.GetSchemaCreationStatusOutput, error) { input := &appsync.GetSchemaCreationStatusInput{ ApiId: aws.String(id), } - output, err := conn.GetSchemaCreationStatusWithContext(ctx, input) + output, err := conn.GetSchemaCreationStatus(ctx, input) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, @@ -562,7 +558,7 @@ func findSchemaCreationStatusByID(ctx context.Context, conn *appsync.AppSync, id return output, nil } -func statusSchemaCreation(ctx context.Context, conn *appsync.AppSync, id string) retry.StateRefreshFunc { +func statusSchemaCreation(ctx context.Context, conn *appsync.Client, id string) retry.StateRefreshFunc { return func() (interface{}, string, error) { output, err := findSchemaCreationStatusByID(ctx, conn, id) @@ -574,14 +570,14 @@ func statusSchemaCreation(ctx context.Context, conn *appsync.AppSync, id string) return nil, "", err } - return output, aws.StringValue(output.Status), nil + return output, string(output.Status), nil } } -func waitSchemaCreated(ctx context.Context, conn *appsync.AppSync, id string, timeout time.Duration) error { +func waitSchemaCreated(ctx context.Context, conn *appsync.Client, id string, timeout time.Duration) (*appsync.GetSchemaCreationStatusOutput, error) { stateConf := &retry.StateChangeConf{ - Pending: []string{appsync.SchemaStatusProcessing}, - Target: []string{appsync.SchemaStatusActive, appsync.SchemaStatusSuccess}, + Pending: enum.Slice(awstypes.SchemaStatusProcessing), + Target: enum.Slice(awstypes.SchemaStatusActive, awstypes.SchemaStatusSuccess), Refresh: statusSchemaCreation(ctx, conn, id), Timeout: timeout, } @@ -589,254 +585,245 @@ func waitSchemaCreated(ctx context.Context, conn *appsync.AppSync, id string, ti outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*appsync.GetSchemaCreationStatusOutput); ok { - tfresource.SetLastError(err, errors.New(aws.StringValue(output.Details))) + tfresource.SetLastError(err, errors.New(aws.ToString(output.Details))) + return output, err } - return err + return nil, err } -func expandGraphQLAPILogConfig(l []interface{}) *appsync.LogConfig { - if len(l) < 1 || l[0] == nil { +func expandLogConfig(tfList []interface{}) *awstypes.LogConfig { + if len(tfList) < 1 || tfList[0] == nil { return nil } - m := l[0].(map[string]interface{}) - - logConfig := &appsync.LogConfig{ - CloudWatchLogsRoleArn: aws.String(m["cloudwatch_logs_role_arn"].(string)), - FieldLogLevel: aws.String(m["field_log_level"].(string)), - ExcludeVerboseContent: aws.Bool(m["exclude_verbose_content"].(bool)), + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.LogConfig{ + CloudWatchLogsRoleArn: aws.String(tfMap["cloudwatch_logs_role_arn"].(string)), + ExcludeVerboseContent: tfMap["exclude_verbose_content"].(bool), + FieldLogLevel: awstypes.FieldLogLevel(tfMap["field_log_level"].(string)), } - return logConfig + return apiObject } -func expandGraphQLAPIOpenIDConnectConfig(l []interface{}) *appsync.OpenIDConnectConfig { - if len(l) < 1 || l[0] == nil { +func expandOpenIDConnectConfig(tfList []interface{}) *awstypes.OpenIDConnectConfig { + if len(tfList) < 1 || tfList[0] == nil { return nil } - m := l[0].(map[string]interface{}) - - openIDConnectConfig := &appsync.OpenIDConnectConfig{ - Issuer: aws.String(m[names.AttrIssuer].(string)), + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.OpenIDConnectConfig{ + Issuer: aws.String(tfMap[names.AttrIssuer].(string)), } - if v, ok := m["auth_ttl"].(int); ok && v != 0 { - openIDConnectConfig.AuthTTL = aws.Int64(int64(v)) + if v, ok := tfMap["auth_ttl"].(int); ok && v != 0 { + apiObject.AuthTTL = int64(v) } - if v, ok := m[names.AttrClientID].(string); ok && v != "" { - openIDConnectConfig.ClientId = aws.String(v) + if v, ok := tfMap[names.AttrClientID].(string); ok && v != "" { + apiObject.ClientId = aws.String(v) } - if v, ok := m["iat_ttl"].(int); ok && v != 0 { - openIDConnectConfig.IatTTL = aws.Int64(int64(v)) + if v, ok := tfMap["iat_ttl"].(int); ok && v != 0 { + apiObject.IatTTL = int64(v) } - return openIDConnectConfig + return apiObject } -func expandGraphQLAPIUserPoolConfig(l []interface{}, currentRegion string) *appsync.UserPoolConfig { - if len(l) < 1 || l[0] == nil { +func expandUserPoolConfig(tfList []interface{}, currentRegion string) *awstypes.UserPoolConfig { + if len(tfList) < 1 || tfList[0] == nil { return nil } - m := l[0].(map[string]interface{}) - - userPoolConfig := &appsync.UserPoolConfig{ + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.UserPoolConfig{ AwsRegion: aws.String(currentRegion), - DefaultAction: aws.String(m[names.AttrDefaultAction].(string)), - UserPoolId: aws.String(m[names.AttrUserPoolID].(string)), + DefaultAction: awstypes.DefaultAction(tfMap[names.AttrDefaultAction].(string)), + UserPoolId: aws.String(tfMap[names.AttrUserPoolID].(string)), } - if v, ok := m["app_id_client_regex"].(string); ok && v != "" { - userPoolConfig.AppIdClientRegex = aws.String(v) + if v, ok := tfMap["app_id_client_regex"].(string); ok && v != "" { + apiObject.AppIdClientRegex = aws.String(v) } - if v, ok := m["aws_region"].(string); ok && v != "" { - userPoolConfig.AwsRegion = aws.String(v) + if v, ok := tfMap["aws_region"].(string); ok && v != "" { + apiObject.AwsRegion = aws.String(v) } - return userPoolConfig + return apiObject } -func expandGraphQLAPILambdaAuthorizerConfig(l []interface{}) *appsync.LambdaAuthorizerConfig { - if len(l) < 1 || l[0] == nil { +func expandLambdaAuthorizerConfig(tfList []interface{}) *awstypes.LambdaAuthorizerConfig { + if len(tfList) < 1 || tfList[0] == nil { return nil } - m := l[0].(map[string]interface{}) - - lambdaAuthorizerConfig := &appsync.LambdaAuthorizerConfig{ - AuthorizerResultTtlInSeconds: aws.Int64(int64(m["authorizer_result_ttl_in_seconds"].(int))), - AuthorizerUri: aws.String(m["authorizer_uri"].(string)), + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.LambdaAuthorizerConfig{ + AuthorizerResultTtlInSeconds: int32(tfMap["authorizer_result_ttl_in_seconds"].(int)), + AuthorizerUri: aws.String(tfMap["authorizer_uri"].(string)), } - if v, ok := m["identity_validation_expression"].(string); ok && v != "" { - lambdaAuthorizerConfig.IdentityValidationExpression = aws.String(v) + if v, ok := tfMap["identity_validation_expression"].(string); ok && v != "" { + apiObject.IdentityValidationExpression = aws.String(v) } - return lambdaAuthorizerConfig + return apiObject } -func expandGraphQLAPIAdditionalAuthProviders(items []interface{}, currentRegion string) []*appsync.AdditionalAuthenticationProvider { - if len(items) < 1 { +func expandAdditionalAuthenticationProviders(tfList []interface{}, currentRegion string) []awstypes.AdditionalAuthenticationProvider { + if len(tfList) < 1 { return nil } - additionalAuthProviders := make([]*appsync.AdditionalAuthenticationProvider, 0, len(items)) - for _, l := range items { - if l == nil { + apiObjects := make([]awstypes.AdditionalAuthenticationProvider, 0) + for _, tfMapRaw := range tfList { + tfMap, ok := tfMapRaw.(map[string]interface{}) + if !ok { continue } - m := l.(map[string]interface{}) - additionalAuthProvider := &appsync.AdditionalAuthenticationProvider{ - AuthenticationType: aws.String(m["authentication_type"].(string)), + apiObject := awstypes.AdditionalAuthenticationProvider{ + AuthenticationType: awstypes.AuthenticationType(tfMap["authentication_type"].(string)), } - if v, ok := m["openid_connect_config"]; ok { - additionalAuthProvider.OpenIDConnectConfig = expandGraphQLAPIOpenIDConnectConfig(v.([]interface{})) + if v, ok := tfMap["lambda_authorizer_config"]; ok { + apiObject.LambdaAuthorizerConfig = expandLambdaAuthorizerConfig(v.([]interface{})) } - if v, ok := m["user_pool_config"]; ok { - additionalAuthProvider.UserPoolConfig = expandGraphQLAPICognitoUserPoolConfig(v.([]interface{}), currentRegion) + if v, ok := tfMap["openid_connect_config"]; ok { + apiObject.OpenIDConnectConfig = expandOpenIDConnectConfig(v.([]interface{})) } - if v, ok := m["lambda_authorizer_config"]; ok { - additionalAuthProvider.LambdaAuthorizerConfig = expandGraphQLAPILambdaAuthorizerConfig(v.([]interface{})) + if v, ok := tfMap["user_pool_config"]; ok { + apiObject.UserPoolConfig = expandCognitoUserPoolConfig(v.([]interface{}), currentRegion) } - additionalAuthProviders = append(additionalAuthProviders, additionalAuthProvider) + apiObjects = append(apiObjects, apiObject) } - return additionalAuthProviders + return apiObjects } -func expandGraphQLAPICognitoUserPoolConfig(l []interface{}, currentRegion string) *appsync.CognitoUserPoolConfig { - if len(l) < 1 || l[0] == nil { +func expandCognitoUserPoolConfig(tfList []interface{}, currentRegion string) *awstypes.CognitoUserPoolConfig { + if len(tfList) < 1 || tfList[0] == nil { return nil } - m := l[0].(map[string]interface{}) - - userPoolConfig := &appsync.CognitoUserPoolConfig{ + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.CognitoUserPoolConfig{ AwsRegion: aws.String(currentRegion), - UserPoolId: aws.String(m[names.AttrUserPoolID].(string)), + UserPoolId: aws.String(tfMap[names.AttrUserPoolID].(string)), } - if v, ok := m["app_id_client_regex"].(string); ok && v != "" { - userPoolConfig.AppIdClientRegex = aws.String(v) + if v, ok := tfMap["app_id_client_regex"].(string); ok && v != "" { + apiObject.AppIdClientRegex = aws.String(v) } - if v, ok := m["aws_region"].(string); ok && v != "" { - userPoolConfig.AwsRegion = aws.String(v) + if v, ok := tfMap["aws_region"].(string); ok && v != "" { + apiObject.AwsRegion = aws.String(v) } - return userPoolConfig + return apiObject } -func flattenGraphQLAPILogConfig(logConfig *appsync.LogConfig) []interface{} { - if logConfig == nil { +func flattenLogConfig(apiObject *awstypes.LogConfig) []interface{} { + if apiObject == nil { return []interface{}{} } - m := map[string]interface{}{ - "cloudwatch_logs_role_arn": aws.StringValue(logConfig.CloudWatchLogsRoleArn), - "field_log_level": aws.StringValue(logConfig.FieldLogLevel), - "exclude_verbose_content": aws.BoolValue(logConfig.ExcludeVerboseContent), + tfMap := map[string]interface{}{ + "cloudwatch_logs_role_arn": aws.ToString(apiObject.CloudWatchLogsRoleArn), + "exclude_verbose_content": apiObject.ExcludeVerboseContent, + "field_log_level": apiObject.FieldLogLevel, } - return []interface{}{m} + return []interface{}{tfMap} } -func flattenGraphQLAPIOpenIDConnectConfig(openIDConnectConfig *appsync.OpenIDConnectConfig) []interface{} { - if openIDConnectConfig == nil { +func flattenOpenIDConnectConfig(apiObject *awstypes.OpenIDConnectConfig) []interface{} { + if apiObject == nil { return []interface{}{} } - m := map[string]interface{}{ - "auth_ttl": aws.Int64Value(openIDConnectConfig.AuthTTL), - names.AttrClientID: aws.StringValue(openIDConnectConfig.ClientId), - "iat_ttl": aws.Int64Value(openIDConnectConfig.IatTTL), - names.AttrIssuer: aws.StringValue(openIDConnectConfig.Issuer), + tfMap := map[string]interface{}{ + "auth_ttl": apiObject.AuthTTL, + names.AttrClientID: aws.ToString(apiObject.ClientId), + "iat_ttl": apiObject.IatTTL, + names.AttrIssuer: aws.ToString(apiObject.Issuer), } - return []interface{}{m} + return []interface{}{tfMap} } -func flattenGraphQLAPIUserPoolConfig(userPoolConfig *appsync.UserPoolConfig) []interface{} { - if userPoolConfig == nil { +func flattenUserPoolConfig(apiObject *awstypes.UserPoolConfig) []interface{} { + if apiObject == nil { return []interface{}{} } - m := map[string]interface{}{ - "aws_region": aws.StringValue(userPoolConfig.AwsRegion), - names.AttrDefaultAction: aws.StringValue(userPoolConfig.DefaultAction), - names.AttrUserPoolID: aws.StringValue(userPoolConfig.UserPoolId), + tfMap := map[string]interface{}{ + "aws_region": aws.ToString(apiObject.AwsRegion), + names.AttrDefaultAction: apiObject.DefaultAction, + names.AttrUserPoolID: aws.ToString(apiObject.UserPoolId), } - if userPoolConfig.AppIdClientRegex != nil { - m["app_id_client_regex"] = aws.StringValue(userPoolConfig.AppIdClientRegex) + if apiObject.AppIdClientRegex != nil { + tfMap["app_id_client_regex"] = aws.ToString(apiObject.AppIdClientRegex) } - return []interface{}{m} + return []interface{}{tfMap} } -func flattenGraphQLAPILambdaAuthorizerConfig(lambdaAuthorizerConfig *appsync.LambdaAuthorizerConfig) []interface{} { - if lambdaAuthorizerConfig == nil { +func flattenLambdaAuthorizerConfig(apiObject *awstypes.LambdaAuthorizerConfig) []interface{} { + if apiObject == nil { return []interface{}{} } - m := map[string]interface{}{ - "authorizer_uri": aws.StringValue(lambdaAuthorizerConfig.AuthorizerUri), - } - - if lambdaAuthorizerConfig.AuthorizerResultTtlInSeconds != nil { - m["authorizer_result_ttl_in_seconds"] = aws.Int64Value(lambdaAuthorizerConfig.AuthorizerResultTtlInSeconds) - } else { - m["authorizer_result_ttl_in_seconds"] = DefaultAuthorizerResultTTLInSeconds + tfMap := map[string]interface{}{ + "authorizer_result_ttl_in_seconds": apiObject.AuthorizerResultTtlInSeconds, + "authorizer_uri": aws.ToString(apiObject.AuthorizerUri), } - if lambdaAuthorizerConfig.IdentityValidationExpression != nil { - m["identity_validation_expression"] = aws.StringValue(lambdaAuthorizerConfig.IdentityValidationExpression) + if apiObject.IdentityValidationExpression != nil { + tfMap["identity_validation_expression"] = aws.ToString(apiObject.IdentityValidationExpression) } - return []interface{}{m} + return []interface{}{tfMap} } -func flattenGraphQLAPIAdditionalAuthenticationProviders(additionalAuthenticationProviders []*appsync.AdditionalAuthenticationProvider) []interface{} { - if len(additionalAuthenticationProviders) == 0 { +func flattenAdditionalAuthenticationProviders(apiObjects []awstypes.AdditionalAuthenticationProvider) []interface{} { + if len(apiObjects) == 0 { return []interface{}{} } - result := make([]interface{}, len(additionalAuthenticationProviders)) - for i, provider := range additionalAuthenticationProviders { - result[i] = map[string]interface{}{ - "authentication_type": aws.StringValue(provider.AuthenticationType), - "lambda_authorizer_config": flattenGraphQLAPILambdaAuthorizerConfig(provider.LambdaAuthorizerConfig), - "openid_connect_config": flattenGraphQLAPIOpenIDConnectConfig(provider.OpenIDConnectConfig), - "user_pool_config": flattenGraphQLAPICognitoUserPoolConfig(provider.UserPoolConfig), + tfList := make([]interface{}, len(apiObjects)) + for i, apiObject := range apiObjects { + tfList[i] = map[string]interface{}{ + "authentication_type": apiObject.AuthenticationType, + "lambda_authorizer_config": flattenLambdaAuthorizerConfig(apiObject.LambdaAuthorizerConfig), + "openid_connect_config": flattenOpenIDConnectConfig(apiObject.OpenIDConnectConfig), + "user_pool_config": flattenCognitoUserPoolConfig(apiObject.UserPoolConfig), } } - return result + return tfList } -func flattenGraphQLAPICognitoUserPoolConfig(userPoolConfig *appsync.CognitoUserPoolConfig) []interface{} { - if userPoolConfig == nil { +func flattenCognitoUserPoolConfig(apiObject *awstypes.CognitoUserPoolConfig) []interface{} { + if apiObject == nil { return []interface{}{} } - m := map[string]interface{}{ - "aws_region": aws.StringValue(userPoolConfig.AwsRegion), - names.AttrUserPoolID: aws.StringValue(userPoolConfig.UserPoolId), + tfMap := map[string]interface{}{ + "aws_region": aws.ToString(apiObject.AwsRegion), + names.AttrUserPoolID: aws.ToString(apiObject.UserPoolId), } - if userPoolConfig.AppIdClientRegex != nil { - m["app_id_client_regex"] = aws.StringValue(userPoolConfig.AppIdClientRegex) + if apiObject.AppIdClientRegex != nil { + tfMap["app_id_client_regex"] = aws.ToString(apiObject.AppIdClientRegex) } - return []interface{}{m} + return []interface{}{tfMap} } diff --git a/internal/service/appsync/graphql_api_test.go b/internal/service/appsync/graphql_api_test.go index d8fcf253307..fffdec4bbd4 100644 --- a/internal/service/appsync/graphql_api_test.go +++ b/internal/service/appsync/graphql_api_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -23,12 +23,12 @@ import ( func testAccGraphQLAPI_basic(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -66,12 +66,12 @@ func testAccGraphQLAPI_basic(t *testing.T) { func testAccGraphQLAPI_disappears(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -90,12 +90,12 @@ func testAccGraphQLAPI_disappears(t *testing.T) { func testAccGraphQLAPI_schema(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -137,12 +137,12 @@ func testAccGraphQLAPI_schema(t *testing.T) { func testAccGraphQLAPI_authenticationType(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -172,12 +172,12 @@ func testAccGraphQLAPI_authenticationType(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_apiKey(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -202,12 +202,12 @@ func testAccGraphQLAPI_AuthenticationType_apiKey(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_iam(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -232,13 +232,13 @@ func testAccGraphQLAPI_AuthenticationType_iam(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_amazonCognitoUserPools(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -265,12 +265,12 @@ func testAccGraphQLAPI_AuthenticationType_amazonCognitoUserPools(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_openIDConnect(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -295,13 +295,13 @@ func testAccGraphQLAPI_AuthenticationType_openIDConnect(t *testing.T) { func testAccGraphQLAPI_AuthenticationType_lambda(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -328,13 +328,13 @@ func testAccGraphQLAPI_AuthenticationType_lambda(t *testing.T) { func testAccGraphQLAPI_log(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) iamRoleResourceName := "aws_iam_role.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -360,13 +360,13 @@ func testAccGraphQLAPI_log(t *testing.T) { func testAccGraphQLAPI_Log_fieldLogLevel(t *testing.T) { ctx := acctest.Context(t) - var api1, api2, api3 appsync.GraphqlApi + var api1, api2, api3 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) iamRoleResourceName := "aws_iam_role.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -412,13 +412,13 @@ func testAccGraphQLAPI_Log_fieldLogLevel(t *testing.T) { func testAccGraphQLAPI_Log_excludeVerboseContent(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) iamRoleResourceName := "aws_iam_role.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -455,12 +455,12 @@ func testAccGraphQLAPI_Log_excludeVerboseContent(t *testing.T) { func testAccGraphQLAPI_OpenIDConnect_authTTL(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -496,12 +496,12 @@ func testAccGraphQLAPI_OpenIDConnect_authTTL(t *testing.T) { func testAccGraphQLAPI_OpenIDConnect_clientID(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -537,12 +537,12 @@ func testAccGraphQLAPI_OpenIDConnect_clientID(t *testing.T) { func testAccGraphQLAPI_OpenIDConnect_iatTTL(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -578,12 +578,12 @@ func testAccGraphQLAPI_OpenIDConnect_iatTTL(t *testing.T) { func testAccGraphQLAPI_OpenIDConnect_issuer(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -617,13 +617,13 @@ func testAccGraphQLAPI_OpenIDConnect_issuer(t *testing.T) { func testAccGraphQLAPI_name(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName1 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) rName2 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -648,13 +648,13 @@ func testAccGraphQLAPI_name(t *testing.T) { func testAccGraphQLAPI_UserPool_region(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -692,13 +692,13 @@ func testAccGraphQLAPI_UserPool_region(t *testing.T) { func testAccGraphQLAPI_UserPool_defaultAction(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -736,13 +736,13 @@ func testAccGraphQLAPI_UserPool_defaultAction(t *testing.T) { func testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerURI(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -776,13 +776,13 @@ func testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerURI(t *testing.T) { func testAccGraphQLAPI_LambdaAuthorizerConfig_identityValidationExpression(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -818,12 +818,12 @@ func testAccGraphQLAPI_LambdaAuthorizerConfig_identityValidationExpression(t *te func testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerResultTTLInSeconds(t *testing.T) { ctx := acctest.Context(t) - var api1, api2, api3, api4 appsync.GraphqlApi + var api1, api2, api3, api4 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -875,12 +875,12 @@ func testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerResultTTLInSeconds(t *te func testAccGraphQLAPI_tags(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -921,12 +921,12 @@ func testAccGraphQLAPI_tags(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_apiKey(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -956,12 +956,12 @@ func testAccGraphQLAPI_AdditionalAuthentication_apiKey(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_iam(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -991,13 +991,13 @@ func testAccGraphQLAPI_AdditionalAuthentication_iam(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_cognitoUserPools(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1028,12 +1028,12 @@ func testAccGraphQLAPI_AdditionalAuthentication_cognitoUserPools(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_openIDConnect(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1064,13 +1064,13 @@ func testAccGraphQLAPI_AdditionalAuthentication_openIDConnect(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_lambda(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1103,14 +1103,14 @@ func testAccGraphQLAPI_AdditionalAuthentication_lambda(t *testing.T) { func testAccGraphQLAPI_AdditionalAuthentication_multiple(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) cognitoUserPoolResourceName := "aws_cognito_user_pool.test" lambdaAuthorizerResourceName := "aws_lambda_function.test" resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1155,12 +1155,12 @@ func testAccGraphQLAPI_AdditionalAuthentication_multiple(t *testing.T) { func testAccGraphQLAPI_xrayEnabled(t *testing.T) { ctx := acctest.Context(t) - var api1, api2 appsync.GraphqlApi + var api1, api2 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1185,12 +1185,12 @@ func testAccGraphQLAPI_xrayEnabled(t *testing.T) { func testAccGraphQLAPI_visibility(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1214,12 +1214,12 @@ func testAccGraphQLAPI_visibility(t *testing.T) { func testAccGraphQLAPI_introspectionConfig(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1242,12 +1242,12 @@ func testAccGraphQLAPI_introspectionConfig(t *testing.T) { func testAccGraphQLAPI_queryDepthLimit(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1270,12 +1270,12 @@ func testAccGraphQLAPI_queryDepthLimit(t *testing.T) { func testAccGraphQLAPI_resolverCountLimit(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi + var api1 awstypes.GraphqlApi rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_appsync_graphql_api.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckGraphQLAPIDestroy(ctx), @@ -1298,7 +1298,8 @@ func testAccGraphQLAPI_resolverCountLimit(t *testing.T) { func testAccCheckGraphQLAPIDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_graphql_api" { continue @@ -1320,18 +1321,14 @@ func testAccCheckGraphQLAPIDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckGraphQLAPIExists(ctx context.Context, n string, v *appsync.GraphqlApi) resource.TestCheckFunc { +func testAccCheckGraphQLAPIExists(ctx context.Context, n string, v *awstypes.GraphqlApi) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { return fmt.Errorf("Not found: %s", n) } - if rs.Primary.ID == "" { - return fmt.Errorf("No AppSync GraphQL API ID is set") - } - - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) output, err := tfappsync.FindGraphQLAPIByID(ctx, conn, rs.Primary.ID) @@ -1352,9 +1349,9 @@ func testAccCheckGraphQLAPITypeExists(ctx context.Context, n, typeName string) r return fmt.Errorf("Not found: %s", n) } - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) - _, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.ID, appsync.OutputTypeSdl, typeName) + _, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.ID, awstypes.OutputTypeSdl, typeName) return err } diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index 59dc4cfc60a..d9562ae062c 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -60,7 +60,7 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePacka Name: "Function", }, { - Factory: ResourceGraphQLAPI, + Factory: resourceGraphQLAPI, TypeName: "aws_appsync_graphql_api", Name: "GraphQL API", Tags: &types.ServicePackageResourceTags{ From 8abc8a5652e614171edda565efaee41b9e87b633 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 08:44:06 -0400 Subject: [PATCH 014/208] r/aws_appsync_type: Migrate to AWS SDK for Go v2. --- internal/service/appsync/exports_test.go | 2 + internal/service/appsync/find.go | 41 ------ internal/service/appsync/graphql_api_test.go | 2 +- .../service/appsync/service_package_gen.go | 3 +- internal/service/appsync/type.go | 134 ++++++++++++------ internal/service/appsync/type_test.go | 45 +++--- 6 files changed, 119 insertions(+), 108 deletions(-) delete mode 100644 internal/service/appsync/find.go diff --git a/internal/service/appsync/exports_test.go b/internal/service/appsync/exports_test.go index 605a8e0e4f3..9c88dc32070 100644 --- a/internal/service/appsync/exports_test.go +++ b/internal/service/appsync/exports_test.go @@ -12,6 +12,7 @@ var ( ResourceDomainNameAPIAssociation = resourceDomainNameAPIAssociation ResourceFunction = resourceFunction ResourceGraphQLAPI = resourceGraphQLAPI + ResourceType = resourceType DefaultAuthorizerResultTTLInSeconds = defaultAuthorizerResultTTLInSeconds FindAPICacheByID = findAPICacheByID @@ -21,4 +22,5 @@ var ( FindDomainNameByID = findDomainNameByID FindFunctionByTwoPartKey = findFunctionByTwoPartKey FindGraphQLAPIByID = findGraphQLAPIByID + FindTypeByThreePartKey = findTypeByThreePartKey ) diff --git a/internal/service/appsync/find.go b/internal/service/appsync/find.go deleted file mode 100644 index 08a947657a5..00000000000 --- a/internal/service/appsync/find.go +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -package appsync - -import ( - "context" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" -) - -func FindTypeByThreePartKey(ctx context.Context, conn *appsync.AppSync, apiID, format, name string) (*appsync.Type, error) { - input := &appsync.GetTypeInput{ - ApiId: aws.String(apiID), - Format: aws.String(format), - TypeName: aws.String(name), - } - - output, err := conn.GetTypeWithContext(ctx, input) - - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { - return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: input, - } - } - - if err != nil { - return nil, err - } - - if output == nil || output.Type == nil { - return nil, tfresource.NewEmptyResultError(input) - } - - return output.Type, nil -} diff --git a/internal/service/appsync/graphql_api_test.go b/internal/service/appsync/graphql_api_test.go index fffdec4bbd4..079c396ca96 100644 --- a/internal/service/appsync/graphql_api_test.go +++ b/internal/service/appsync/graphql_api_test.go @@ -1351,7 +1351,7 @@ func testAccCheckGraphQLAPITypeExists(ctx context.Context, n, typeName string) r conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) - _, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.ID, awstypes.OutputTypeSdl, typeName) + _, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.ID, awstypes.TypeDefinitionFormatSdl, typeName) return err } diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index d9562ae062c..40ec0f70308 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -73,8 +73,9 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePacka Name: "Resolver", }, { - Factory: ResourceType, + Factory: resourceType, TypeName: "aws_appsync_type", + Name: "Type", }, } } diff --git a/internal/service/appsync/type.go b/internal/service/appsync/type.go index 06009b9e942..eebb2645a8a 100644 --- a/internal/service/appsync/type.go +++ b/internal/service/appsync/type.go @@ -9,25 +9,28 @@ import ( "log" "strings" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) -// @SDKResource("aws_appsync_type") -func ResourceType() *schema.Resource { +// @SDKResource("aws_appsync_type", name="Type") +func resourceType() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceTypeCreate, ReadWithoutTimeout: resourceTypeRead, UpdateWithoutTimeout: resourceTypeUpdate, DeleteWithoutTimeout: resourceTypeDelete, + Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, @@ -51,9 +54,9 @@ func ResourceType() *schema.Resource { Required: true, }, names.AttrFormat: { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.TypeDefinitionFormat_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.TypeDefinitionFormat](), }, names.AttrName: { Type: schema.TypeString, @@ -65,36 +68,37 @@ func ResourceType() *schema.Resource { func resourceTypeCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID := d.Get("api_id").(string) - - params := &appsync.CreateTypeInput{ + input := &appsync.CreateTypeInput{ ApiId: aws.String(apiID), Definition: aws.String(d.Get("definition").(string)), - Format: aws.String(d.Get(names.AttrFormat).(string)), + Format: awstypes.TypeDefinitionFormat(d.Get(names.AttrFormat).(string)), } - out, err := conn.CreateTypeWithContext(ctx, params) + output, err := conn.CreateType(ctx, input) + if err != nil { return sdkdiag.AppendErrorf(diags, "creating Appsync Type: %s", err) } - d.SetId(fmt.Sprintf("%s:%s:%s", apiID, aws.StringValue(out.Type.Format), aws.StringValue(out.Type.Name))) + d.SetId(typeCreateResourceID(apiID, output.Type.Format, aws.ToString(output.Type.Name))) return append(diags, resourceTypeRead(ctx, d, meta)...) } func resourceTypeRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - apiID, format, name, err := DecodeTypeID(d.Id()) + apiID, format, name, err := typeParseResourceID(d.Id()) if err != nil { - return sdkdiag.AppendErrorf(diags, "reading Appsync Type %q: %s", d.Id(), err) + return sdkdiag.AppendFromErr(diags, err) } - resp, err := FindTypeByThreePartKey(ctx, conn, apiID, format, name) + resp, err := findTypeByThreePartKey(ctx, conn, apiID, format, name) + if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] AppSync Type (%s) not found, removing from state", d.Id()) d.SetId("") @@ -117,18 +121,24 @@ func resourceTypeRead(ctx context.Context, d *schema.ResourceData, meta interfac func resourceTypeUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - params := &appsync.UpdateTypeInput{ - ApiId: aws.String(d.Get("api_id").(string)), - Format: aws.String(d.Get(names.AttrFormat).(string)), - TypeName: aws.String(d.Get(names.AttrName).(string)), + apiID, format, name, err := typeParseResourceID(d.Id()) + if err != nil { + return sdkdiag.AppendFromErr(diags, err) + } + + input := &appsync.UpdateTypeInput{ + ApiId: aws.String(apiID), Definition: aws.String(d.Get("definition").(string)), + Format: format, + TypeName: aws.String(name), } - _, err := conn.UpdateTypeWithContext(ctx, params) + _, err = conn.UpdateType(ctx, input) + if err != nil { - return sdkdiag.AppendErrorf(diags, "updating Appsync Type %q: %s", d.Id(), err) + return sdkdiag.AppendErrorf(diags, "updating Appsync Type (%s): %s", d.Id(), err) } return append(diags, resourceTypeRead(ctx, d, meta)...) @@ -136,27 +146,71 @@ func resourceTypeUpdate(ctx context.Context, d *schema.ResourceData, meta interf func resourceTypeDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - input := &appsync.DeleteTypeInput{ - ApiId: aws.String(d.Get("api_id").(string)), - TypeName: aws.String(d.Get(names.AttrName).(string)), + apiID, _, name, err := typeParseResourceID(d.Id()) + if err != nil { + return sdkdiag.AppendFromErr(diags, err) } - _, err := conn.DeleteTypeWithContext(ctx, input) + + _, err = conn.DeleteType(ctx, &appsync.DeleteTypeInput{ + ApiId: aws.String(apiID), + TypeName: aws.String(name), + }) + + if errs.IsA[*awstypes.NotFoundException](err) { + return diags + } + if err != nil { - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { - return diags - } - return sdkdiag.AppendErrorf(diags, "deleting Appsync Type: %s", err) + return sdkdiag.AppendErrorf(diags, "deleting Appsync Type (%s): %s", d.Id(), err) } return diags } -func DecodeTypeID(id string) (string, string, string, error) { - parts := strings.Split(id, ":") - if len(parts) != 3 { - return "", "", "", fmt.Errorf("Unexpected format of ID (%q), expected API-ID:FORMAT:TYPE-NAME", id) +const typeResourceIDSeparator = ":" + +func typeCreateResourceID(apiID string, format awstypes.TypeDefinitionFormat, name string) string { + parts := []string{apiID, string(format), name} + id := strings.Join(parts, typeResourceIDSeparator) + + return id +} + +func typeParseResourceID(id string) (string, awstypes.TypeDefinitionFormat, string, error) { + parts := strings.Split(id, typeResourceIDSeparator) + + if len(parts) != 3 || parts[0] == "" || parts[1] == "" || parts[2] == "" { + return "", "", "", fmt.Errorf("unexpected format for ID (%[1]s), expected API-ID%[2]sFORMAT%[2]sTYPE-NAME", id, typeResourceIDSeparator) + } + + return parts[0], awstypes.TypeDefinitionFormat(parts[1]), parts[2], nil +} + +func findTypeByThreePartKey(ctx context.Context, conn *appsync.Client, apiID string, format awstypes.TypeDefinitionFormat, name string) (*awstypes.Type, error) { + input := &appsync.GetTypeInput{ + ApiId: aws.String(apiID), + Format: format, + TypeName: aws.String(name), + } + + output, err := conn.GetType(ctx, input) + + if errs.IsA[*awstypes.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } } - return parts[0], parts[1], parts[2], nil + + if err != nil { + return nil, err + } + + if output == nil || output.Type == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output.Type, nil } diff --git a/internal/service/appsync/type_test.go b/internal/service/appsync/type_test.go index e4cf8ab4ab6..2888677c4f1 100644 --- a/internal/service/appsync/type_test.go +++ b/internal/service/appsync/type_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -22,12 +22,12 @@ import ( func testAccType_basic(t *testing.T) { ctx := acctest.Context(t) - var typ appsync.Type + var typ awstypes.Type resourceName := "aws_appsync_type.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckTypeDestroy(ctx), @@ -53,12 +53,12 @@ func testAccType_basic(t *testing.T) { func testAccType_disappears(t *testing.T) { ctx := acctest.Context(t) - var typ appsync.Type + var typ awstypes.Type resourceName := "aws_appsync_type.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckTypeDestroy(ctx), @@ -77,51 +77,46 @@ func testAccType_disappears(t *testing.T) { func testAccCheckTypeDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_type" { continue } - apiID, format, name, err := tfappsync.DecodeTypeID(rs.Primary.ID) - if err != nil { - return err + _, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.Attributes["api_id"], awstypes.TypeDefinitionFormat(rs.Primary.Attributes["format"]), rs.Primary.Attributes["name"]) + + if tfresource.NotFound(err) { + continue } - _, err = tfappsync.FindTypeByThreePartKey(ctx, conn, apiID, format, name) - if err == nil { - if tfresource.NotFound(err) { - return nil - } + if err != nil { return err } - return nil + return fmt.Errorf("Appsync Type %s still exists", rs.Primary.ID) } + return nil } } -func testAccCheckTypeExists(ctx context.Context, resourceName string, typ *appsync.Type) resource.TestCheckFunc { +func testAccCheckTypeExists(ctx context.Context, n string, v *awstypes.Type) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] + rs, ok := s.RootModule().Resources[n] if !ok { - return fmt.Errorf("Appsync Type Not found in state: %s", resourceName) + return fmt.Errorf("Not found: %s", n) } - apiID, format, name, err := tfappsync.DecodeTypeID(rs.Primary.ID) - if err != nil { - return err - } + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + + output, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.Attributes["api_id"], awstypes.TypeDefinitionFormat(rs.Primary.Attributes["format"]), rs.Primary.Attributes["name"]) - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) - out, err := tfappsync.FindTypeByThreePartKey(ctx, conn, apiID, format, name) if err != nil { return err } - *typ = *out + *v = *output return nil } From 75a893dde54db7b3883b14e66e3f98101a0e23a4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 09:13:13 -0400 Subject: [PATCH 015/208] r/aws_appsync_resolver: Migrate to AWS SDK for Go v2. --- internal/service/appsync/exports_test.go | 2 + internal/service/appsync/resolver.go | 303 ++++++++++-------- internal/service/appsync/resolver_test.go | 101 +++--- .../service/appsync/service_package_gen.go | 2 +- internal/service/appsync/type.go | 1 + 5 files changed, 206 insertions(+), 203 deletions(-) diff --git a/internal/service/appsync/exports_test.go b/internal/service/appsync/exports_test.go index 9c88dc32070..8a96bc50732 100644 --- a/internal/service/appsync/exports_test.go +++ b/internal/service/appsync/exports_test.go @@ -12,6 +12,7 @@ var ( ResourceDomainNameAPIAssociation = resourceDomainNameAPIAssociation ResourceFunction = resourceFunction ResourceGraphQLAPI = resourceGraphQLAPI + ResourceResolver = resourceResolver ResourceType = resourceType DefaultAuthorizerResultTTLInSeconds = defaultAuthorizerResultTTLInSeconds @@ -22,5 +23,6 @@ var ( FindDomainNameByID = findDomainNameByID FindFunctionByTwoPartKey = findFunctionByTwoPartKey FindGraphQLAPIByID = findGraphQLAPIByID + FindResolverByThreePartKey = findResolverByThreePartKey FindTypeByThreePartKey = findTypeByThreePartKey ) diff --git a/internal/service/appsync/resolver.go b/internal/service/appsync/resolver.go index 1d5fe08f8a7..431dea16d78 100644 --- a/internal/service/appsync/resolver.go +++ b/internal/service/appsync/resolver.go @@ -10,13 +10,16 @@ import ( "strings" "time" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -25,7 +28,7 @@ import ( ) // @SDKResource("aws_appsync_resolver", name="Resolver) -func ResourceResolver() *schema.Resource { +func resourceResolver() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceResolverCreate, ReadWithoutTimeout: resourceResolverRead, @@ -84,10 +87,10 @@ func ResourceResolver() *schema.Resource { ForceNew: true, }, "kind": { - Type: schema.TypeString, - Optional: true, - Default: appsync.ResolverKindUnit, - ValidateFunc: validation.StringInSlice(appsync.ResolverKind_Values(), true), + Type: schema.TypeString, + Optional: true, + Default: awstypes.ResolverKindUnit, + ValidateDiagFunc: enum.Validate[awstypes.ResolverKind](), }, "max_batch_size": { Type: schema.TypeInt, @@ -127,9 +130,9 @@ func ResourceResolver() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ names.AttrName: { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringInSlice(appsync.RuntimeName_Values(), false), + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.RuntimeName](), }, "runtime_version": { Type: schema.TypeString, @@ -145,14 +148,14 @@ func ResourceResolver() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "conflict_detection": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice(appsync.ConflictDetectionType_Values(), false), + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.ConflictDetectionType](), }, "conflict_handler": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringInSlice(appsync.ConflictHandlerType_Values(), false), + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.ConflictHandlerType](), }, "lambda_conflict_handler_config": { Type: schema.TypeList, @@ -182,32 +185,33 @@ func ResourceResolver() *schema.Resource { func resourceResolverCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) apiID, typeName, fieldName := d.Get("api_id").(string), d.Get(names.AttrType).(string), d.Get(names.AttrField).(string) + id := resolverCreateResourceID(apiID, typeName, fieldName) input := &appsync.CreateResolverInput{ ApiId: aws.String(apiID), FieldName: aws.String(fieldName), - Kind: aws.String(d.Get("kind").(string)), + Kind: awstypes.ResolverKind(d.Get("kind").(string)), TypeName: aws.String(typeName), } - if v, ok := d.GetOk("code"); ok { - input.Code = aws.String(v.(string)) - } - - if v, ok := d.GetOkExists("max_batch_size"); ok { - input.MaxBatchSize = aws.Int64(int64(v.(int))) + if v, ok := d.GetOk("caching_config"); ok { + input.CachingConfig = expandResolverCachingConfig(v.([]interface{})) } - if v, ok := d.GetOk("sync_config"); ok && len(v.([]interface{})) > 0 { - input.SyncConfig = expandSyncConfig(v.([]interface{})) + if v, ok := d.GetOk("code"); ok { + input.Code = aws.String(v.(string)) } if v, ok := d.GetOk("data_source"); ok { input.DataSourceName = aws.String(v.(string)) } + if v, ok := d.GetOk("max_batch_size"); ok { + input.MaxBatchSize = int32(v.(int)) + } + if v, ok := d.GetOk("pipeline_config"); ok && len(v.([]interface{})) > 0 { input.PipelineConfig = expandPipelineConfig(v.([]interface{})) } @@ -220,94 +224,79 @@ func resourceResolverCreate(ctx context.Context, d *schema.ResourceData, meta in input.ResponseMappingTemplate = aws.String(v.(string)) } - if v, ok := d.GetOk("caching_config"); ok { - input.CachingConfig = expandResolverCachingConfig(v.([]interface{})) - } - if v, ok := d.GetOk("runtime"); ok && len(v.([]interface{})) > 0 { input.Runtime = expandRuntime(v.([]interface{})) } - mutexKey := "appsync-schema-" + apiID - conns.GlobalMutexKV.Lock(mutexKey) - defer conns.GlobalMutexKV.Unlock(mutexKey) + if v, ok := d.GetOk("sync_config"); ok && len(v.([]interface{})) > 0 { + input.SyncConfig = expandSyncConfig(v.([]interface{})) + } - _, err := tfresource.RetryWhenAWSErrCodeEquals(ctx, 2*time.Minute, func() (interface{}, error) { - return conn.CreateResolverWithContext(ctx, input) - }, appsync.ErrCodeConcurrentModificationException) + _, err := retryResolverOp(ctx, apiID, func() (interface{}, error) { + return conn.CreateResolver(ctx, input) + }) if err != nil { - return sdkdiag.AppendErrorf(diags, "creating AppSync Resolver: %s", err) + return sdkdiag.AppendErrorf(diags, "creating AppSync Resolver (%s): %s", id, err) } - d.SetId(apiID + "-" + typeName + "-" + fieldName) + d.SetId(id) return append(diags, resourceResolverRead(ctx, d, meta)...) } func resourceResolverRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - apiID, typeName, fieldName, err := DecodeResolverID(d.Id()) + apiID, typeName, fieldName, err := resolverParseResourceID(d.Id()) if err != nil { return sdkdiag.AppendFromErr(diags, err) } - input := &appsync.GetResolverInput{ - ApiId: aws.String(apiID), - TypeName: aws.String(typeName), - FieldName: aws.String(fieldName), - } - - resp, err := conn.GetResolverWithContext(ctx, input) + resolver, err := findResolverByThreePartKey(ctx, conn, apiID, typeName, fieldName) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) && !d.IsNewResource() { + if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] AppSync Resolver (%s) not found, removing from state", d.Id()) d.SetId("") return diags } if err != nil { - return sdkdiag.AppendErrorf(diags, "reading AppSync Resolver (%s): %s", d.Id(), err) + return sdkdiag.AppendErrorf(diags, "reading Appsync Resolver (%s): %s", d.Id(), err) } - resolver := resp.Resolver d.Set("api_id", apiID) d.Set(names.AttrARN, resolver.ResolverArn) - d.Set(names.AttrType, resolver.TypeName) - d.Set(names.AttrField, resolver.FieldName) + if err := d.Set("caching_config", flattenCachingConfig(resolver.CachingConfig)); err != nil { + return sdkdiag.AppendErrorf(diags, "setting caching_config: %s", err) + } + d.Set("code", resolver.Code) d.Set("data_source", resolver.DataSourceName) - d.Set("request_template", resolver.RequestMappingTemplate) - d.Set("response_template", resolver.ResponseMappingTemplate) + d.Set(names.AttrField, resolver.FieldName) d.Set("kind", resolver.Kind) d.Set("max_batch_size", resolver.MaxBatchSize) - d.Set("code", resolver.Code) - - if err := d.Set("sync_config", flattenSyncConfig(resolver.SyncConfig)); err != nil { - return sdkdiag.AppendErrorf(diags, "setting sync_config: %s", err) - } - if err := d.Set("pipeline_config", flattenPipelineConfig(resolver.PipelineConfig)); err != nil { return sdkdiag.AppendErrorf(diags, "setting pipeline_config: %s", err) } - - if err := d.Set("caching_config", flattenCachingConfig(resolver.CachingConfig)); err != nil { - return sdkdiag.AppendErrorf(diags, "setting caching_config: %s", err) - } - + d.Set("request_template", resolver.RequestMappingTemplate) + d.Set("response_template", resolver.ResponseMappingTemplate) if err := d.Set("runtime", flattenRuntime(resolver.Runtime)); err != nil { return sdkdiag.AppendErrorf(diags, "setting runtime: %s", err) } + if err := d.Set("sync_config", flattenSyncConfig(resolver.SyncConfig)); err != nil { + return sdkdiag.AppendErrorf(diags, "setting sync_config: %s", err) + } + d.Set(names.AttrType, resolver.TypeName) return diags } func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - apiID, typeName, fieldName, err := DecodeResolverID(d.Id()) + apiID, typeName, fieldName, err := resolverParseResourceID(d.Id()) if err != nil { return sdkdiag.AppendFromErr(diags, err) } @@ -315,10 +304,14 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in input := &appsync.UpdateResolverInput{ ApiId: aws.String(apiID), FieldName: aws.String(fieldName), - Kind: aws.String(d.Get("kind").(string)), + Kind: awstypes.ResolverKind(d.Get("kind").(string)), TypeName: aws.String(typeName), } + if v, ok := d.GetOk("caching_config"); ok { + input.CachingConfig = expandResolverCachingConfig(v.([]interface{})) + } + if v, ok := d.GetOk("code"); ok { input.Code = aws.String(v.(string)) } @@ -327,10 +320,14 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in input.DataSourceName = aws.String(v.(string)) } + if v, ok := d.GetOk("max_batch_size"); ok { + input.MaxBatchSize = int32(v.(int)) + } + if v, ok := d.GetOk("pipeline_config"); ok { config := v.([]interface{})[0].(map[string]interface{}) - input.PipelineConfig = &appsync.PipelineConfig{ - Functions: flex.ExpandStringList(config["functions"].([]interface{})), + input.PipelineConfig = &awstypes.PipelineConfig{ + Functions: flex.ExpandStringValueList(config["functions"].([]interface{})), } } @@ -342,29 +339,17 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in input.ResponseMappingTemplate = aws.String(v.(string)) } - if v, ok := d.GetOk("caching_config"); ok { - input.CachingConfig = expandResolverCachingConfig(v.([]interface{})) - } - - if v, ok := d.GetOkExists("max_batch_size"); ok { - input.MaxBatchSize = aws.Int64(int64(v.(int))) + if v, ok := d.GetOk("runtime"); ok && len(v.([]interface{})) > 0 { + input.Runtime = expandRuntime(v.([]interface{})) } if v, ok := d.GetOk("sync_config"); ok && len(v.([]interface{})) > 0 { input.SyncConfig = expandSyncConfig(v.([]interface{})) } - if v, ok := d.GetOk("runtime"); ok && len(v.([]interface{})) > 0 { - input.Runtime = expandRuntime(v.([]interface{})) - } - - mutexKey := "appsync-schema-" + apiID - conns.GlobalMutexKV.Lock(mutexKey) - defer conns.GlobalMutexKV.Unlock(mutexKey) - - _, err = tfresource.RetryWhenAWSErrCodeEquals(ctx, 2*time.Minute, func() (interface{}, error) { - return conn.UpdateResolverWithContext(ctx, input) - }, appsync.ErrCodeConcurrentModificationException) + _, err = retryResolverOp(ctx, apiID, func() (interface{}, error) { + return conn.UpdateResolver(ctx, input) + }) if err != nil { return sdkdiag.AppendErrorf(diags, "updating AppSync Resolver (%s): %s", d.Id(), err) @@ -375,28 +360,23 @@ func resourceResolverUpdate(ctx context.Context, d *schema.ResourceData, meta in func resourceResolverDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).AppSyncConn(ctx) + conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - apiID, typeName, fieldName, err := DecodeResolverID(d.Id()) + apiID, typeName, fieldName, err := resolverParseResourceID(d.Id()) if err != nil { return sdkdiag.AppendFromErr(diags, err) } - input := &appsync.DeleteResolverInput{ - ApiId: aws.String(apiID), - FieldName: aws.String(fieldName), - TypeName: aws.String(typeName), - } - - mutexKey := "appsync-schema-" + apiID - conns.GlobalMutexKV.Lock(mutexKey) - defer conns.GlobalMutexKV.Unlock(mutexKey) - - _, err = tfresource.RetryWhenAWSErrCodeEquals(ctx, 2*time.Minute, func() (interface{}, error) { - return conn.DeleteResolverWithContext(ctx, input) - }, appsync.ErrCodeConcurrentModificationException) + log.Printf("[INFO] Deleting Appsync Resolver: %s", d.Id()) + _, err = retryResolverOp(ctx, apiID, func() (interface{}, error) { + return conn.DeleteResolver(ctx, &appsync.DeleteResolverInput{ + ApiId: aws.String(apiID), + FieldName: aws.String(fieldName), + TypeName: aws.String(typeName), + }) + }) - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if errs.IsA[*awstypes.NotFoundException](err) { return diags } @@ -407,77 +387,124 @@ func resourceResolverDelete(ctx context.Context, d *schema.ResourceData, meta in return diags } -func DecodeResolverID(id string) (string, string, string, error) { - idParts := strings.SplitN(id, "-", 3) - if len(idParts) != 3 { - return "", "", "", fmt.Errorf("expected ID in format ApiID-TypeName-FieldName, received: %s", id) +const resolverResourceIDSeparator = "-" + +func resolverCreateResourceID(apiID, typeName, fieldName string) string { + parts := []string{apiID, typeName, fieldName} + id := strings.Join(parts, resolverResourceIDSeparator) + + return id +} + +func resolverParseResourceID(id string) (string, string, string, error) { + parts := strings.SplitN(id, resolverResourceIDSeparator, 3) + + if len(parts) != 3 || parts[0] == "" || parts[1] == "" || parts[2] == "" { + return "", "", "", fmt.Errorf("unexpected format for ID (%[1]s), expected API-ID%[2]sTYPE-NAME%[2]sFIELD-NAME", id, resolverResourceIDSeparator) } - return idParts[0], idParts[1], idParts[2], nil + + return parts[0], parts[1], parts[2], nil } -func expandResolverCachingConfig(l []interface{}) *appsync.CachingConfig { - if len(l) < 1 || l[0] == nil { - return nil +func retryResolverOp(ctx context.Context, apiID string, f func() (interface{}, error)) (interface{}, error) { + mutexKey := "appsync-schema-" + apiID + conns.GlobalMutexKV.Lock(mutexKey) + defer conns.GlobalMutexKV.Unlock(mutexKey) + + const ( + timeout = 2 * time.Minute + ) + return tfresource.RetryWhenIsA[*awstypes.ConcurrentModificationException](ctx, timeout, f) +} + +func findResolverByThreePartKey(ctx context.Context, conn *appsync.Client, apiID, typeName, fieldName string) (*awstypes.Resolver, error) { + input := &appsync.GetResolverInput{ + ApiId: aws.String(apiID), + FieldName: aws.String(fieldName), + TypeName: aws.String(typeName), } - m := l[0].(map[string]interface{}) + output, err := conn.GetResolver(ctx, input) - cachingConfig := &appsync.CachingConfig{ - CachingKeys: flex.ExpandStringSet(m["caching_keys"].(*schema.Set)), + if errs.IsA[*awstypes.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } } - if v, ok := m["ttl"].(int); ok && v != 0 { - cachingConfig.Ttl = aws.Int64(int64(v)) + if err != nil { + return nil, err } - return cachingConfig + if output == nil || output.Resolver == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output.Resolver, nil } -func expandPipelineConfig(l []interface{}) *appsync.PipelineConfig { - if len(l) < 1 || l[0] == nil { +func expandResolverCachingConfig(tfList []interface{}) *awstypes.CachingConfig { + if len(tfList) < 1 || tfList[0] == nil { return nil } - m := l[0].(map[string]interface{}) + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.CachingConfig{ + CachingKeys: flex.ExpandStringValueSet(tfMap["caching_keys"].(*schema.Set)), + } + + if v, ok := tfMap["ttl"].(int); ok && v != 0 { + apiObject.Ttl = int64(v) + } + + return apiObject +} + +func expandPipelineConfig(tfList []interface{}) *awstypes.PipelineConfig { + if len(tfList) < 1 || tfList[0] == nil { + return nil + } - config := &appsync.PipelineConfig{} + tfMap := tfList[0].(map[string]interface{}) + apiObject := &awstypes.PipelineConfig{} - if v, ok := m["functions"].([]interface{}); ok && len(v) > 0 { - config.Functions = flex.ExpandStringList(v) + if v, ok := tfMap["functions"].([]interface{}); ok && len(v) > 0 { + apiObject.Functions = flex.ExpandStringValueList(v) } - return config + return apiObject } -func flattenPipelineConfig(c *appsync.PipelineConfig) []interface{} { - if c == nil { +func flattenPipelineConfig(apiObject *awstypes.PipelineConfig) []interface{} { + if apiObject == nil { return nil } - if len(c.Functions) == 0 { + if len(apiObject.Functions) == 0 { return nil } - m := map[string]interface{}{ - "functions": flex.FlattenStringList(c.Functions), + tfMap := map[string]interface{}{ + "functions": apiObject.Functions, } - return []interface{}{m} + return []interface{}{tfMap} } -func flattenCachingConfig(c *appsync.CachingConfig) []interface{} { - if c == nil { +func flattenCachingConfig(apiObject *awstypes.CachingConfig) []interface{} { + if apiObject == nil { return nil } - if len(c.CachingKeys) == 0 && aws.Int64Value(c.Ttl) == 0 { + if len(apiObject.CachingKeys) == 0 && apiObject.Ttl == 0 { return nil } - m := map[string]interface{}{ - "caching_keys": flex.FlattenStringSet(c.CachingKeys), - "ttl": int(aws.Int64Value(c.Ttl)), + tfMap := map[string]interface{}{ + "caching_keys": apiObject.CachingKeys, + "ttl": apiObject.Ttl, } - return []interface{}{m} + return []interface{}{tfMap} } diff --git a/internal/service/appsync/resolver_test.go b/internal/service/appsync/resolver_test.go index 22427f358df..b43cf827dd1 100644 --- a/internal/service/appsync/resolver_test.go +++ b/internal/service/appsync/resolver_test.go @@ -9,26 +9,25 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfappsync "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) func testAccResolver_basic(t *testing.T) { ctx := acctest.Context(t) - var resolver1 appsync.Resolver + var resolver1 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -56,12 +55,12 @@ func testAccResolver_basic(t *testing.T) { func testAccResolver_code(t *testing.T) { ctx := acctest.Context(t) - var resolver1 appsync.Resolver + var resolver1 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -86,12 +85,12 @@ func testAccResolver_code(t *testing.T) { func testAccResolver_syncConfig(t *testing.T) { ctx := acctest.Context(t) - var resolver1 appsync.Resolver + var resolver1 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -116,14 +115,12 @@ func testAccResolver_syncConfig(t *testing.T) { func testAccResolver_disappears(t *testing.T) { ctx := acctest.Context(t) - var api1 appsync.GraphqlApi - var resolver1 appsync.Resolver + var resolver1 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) - appsyncGraphqlApiResourceName := "aws_appsync_graphql_api.test" resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -131,7 +128,6 @@ func testAccResolver_disappears(t *testing.T) { { Config: testAccResolverConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckGraphQLAPIExists(ctx, appsyncGraphqlApiResourceName, &api1), testAccCheckResolverExists(ctx, resourceName, &resolver1), acctest.CheckResourceDisappears(ctx, acctest.Provider, tfappsync.ResourceResolver(), resourceName), ), @@ -143,12 +139,12 @@ func testAccResolver_disappears(t *testing.T) { func testAccResolver_dataSource(t *testing.T) { ctx := acctest.Context(t) - var resolver1, resolver2 appsync.Resolver + var resolver1, resolver2 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -178,12 +174,12 @@ func testAccResolver_dataSource(t *testing.T) { func testAccResolver_DataSource_lambda(t *testing.T) { ctx := acctest.Context(t) - var resolver appsync.Resolver + var resolver awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -206,12 +202,12 @@ func testAccResolver_DataSource_lambda(t *testing.T) { func testAccResolver_requestTemplate(t *testing.T) { ctx := acctest.Context(t) - var resolver1, resolver2 appsync.Resolver + var resolver1, resolver2 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -241,12 +237,12 @@ func testAccResolver_requestTemplate(t *testing.T) { func testAccResolver_responseTemplate(t *testing.T) { ctx := acctest.Context(t) - var resolver1, resolver2 appsync.Resolver + var resolver1, resolver2 awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -276,12 +272,12 @@ func testAccResolver_responseTemplate(t *testing.T) { func testAccResolver_multipleResolvers(t *testing.T) { ctx := acctest.Context(t) - var resolver appsync.Resolver + var resolver awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -307,12 +303,12 @@ func testAccResolver_multipleResolvers(t *testing.T) { func testAccResolver_pipeline(t *testing.T) { ctx := acctest.Context(t) - var resolver appsync.Resolver + var resolver awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -336,12 +332,12 @@ func testAccResolver_pipeline(t *testing.T) { func testAccResolver_caching(t *testing.T) { ctx := acctest.Context(t) - var resolver appsync.Resolver + var resolver awstypes.Resolver rName := fmt.Sprintf("tfacctest%d", sdkacctest.RandInt()) resourceName := "aws_appsync_resolver.test" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, appsync.EndpointsID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckResolverDestroy(ctx), @@ -365,69 +361,46 @@ func testAccResolver_caching(t *testing.T) { func testAccCheckResolverDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) + for _, rs := range s.RootModule().Resources { if rs.Type != "aws_appsync_resolver" { continue } - apiID, typeName, fieldName, err := tfappsync.DecodeResolverID(rs.Primary.ID) - - if err != nil { - return err - } + _, err := tfappsync.FindResolverByThreePartKey(ctx, conn, rs.Primary.Attributes["api_id"], rs.Primary.Attributes[names.AttrType], rs.Primary.Attributes[names.AttrField]) - input := &appsync.GetResolverInput{ - ApiId: aws.String(apiID), - TypeName: aws.String(typeName), - FieldName: aws.String(fieldName), - } - - _, err = conn.GetResolverWithContext(ctx, input) - - if tfawserr.ErrCodeEquals(err, appsync.ErrCodeNotFoundException) { + if tfresource.NotFound(err) { continue } if err != nil { return err } + + return fmt.Errorf("Appsync Resolver %s still exists", rs.Primary.ID) } + return nil } } -func testAccCheckResolverExists(ctx context.Context, name string, resolver *appsync.Resolver) resource.TestCheckFunc { +func testAccCheckResolverExists(ctx context.Context, n string, v *awstypes.Resolver) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] + rs, ok := s.RootModule().Resources[n] if !ok { - return fmt.Errorf("Not found: %s", name) - } - if rs.Primary.ID == "" { - return fmt.Errorf("Resource has no ID: %s", name) + return fmt.Errorf("Not found: %s", n) } - apiID, typeName, fieldName, err := tfappsync.DecodeResolverID(rs.Primary.ID) - - if err != nil { - return err - } - - conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncConn(ctx) - - input := &appsync.GetResolverInput{ - ApiId: aws.String(apiID), - TypeName: aws.String(typeName), - FieldName: aws.String(fieldName), - } + conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) - output, err := conn.GetResolverWithContext(ctx, input) + output, err := tfappsync.FindResolverByThreePartKey(ctx, conn, rs.Primary.Attributes["api_id"], rs.Primary.Attributes[names.AttrType], rs.Primary.Attributes[names.AttrField]) if err != nil { return err } - *resolver = *output.Resolver + *v = *output return nil } diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index 40ec0f70308..95e1d556b3a 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -68,7 +68,7 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePacka }, }, { - Factory: ResourceResolver, + Factory: resourceResolver, TypeName: "aws_appsync_resolver", Name: "Resolver", }, diff --git a/internal/service/appsync/type.go b/internal/service/appsync/type.go index eebb2645a8a..ab162bda7fd 100644 --- a/internal/service/appsync/type.go +++ b/internal/service/appsync/type.go @@ -153,6 +153,7 @@ func resourceTypeDelete(ctx context.Context, d *schema.ResourceData, meta interf return sdkdiag.AppendFromErr(diags, err) } + log.Printf("[INFO] Deleting Appsync Type: %s", d.Id()) _, err = conn.DeleteType(ctx, &appsync.DeleteTypeInput{ ApiId: aws.String(apiID), TypeName: aws.String(name), From 0b3bfcedfe61ba2a38da6590fd9785ecda32436b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 09:23:21 -0400 Subject: [PATCH 016/208] appsync: Migrate sweepers to AWS SDK for Go v2. --- internal/service/appsync/generate.go | 2 +- internal/service/appsync/list_pages_gen.go | 34 ++++- internal/service/appsync/sweep.go | 160 ++++++++------------- 3 files changed, 97 insertions(+), 99 deletions(-) diff --git a/internal/service/appsync/generate.go b/internal/service/appsync/generate.go index 7bbb855d46a..7e26da3e015 100644 --- a/internal/service/appsync/generate.go +++ b/internal/service/appsync/generate.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -//go:generate go run ../../generate/listpages/main.go -AWSSDKVersion=2 -ListOps=ListApiKeys +//go:generate go run ../../generate/listpages/main.go -AWSSDKVersion=2 -ListOps=ListApiKeys,ListDomainNames,ListGraphqlApis //go:generate go run ../../generate/tags/main.go -AWSSDKVersion=2 -ListTags -ServiceTagsMap -UpdateTags -KVTValues -SkipTypesImp //go:generate go run ../../generate/servicepackage/main.go // ONLY generate directives and package declaration! Do not add anything else to this file. diff --git a/internal/service/appsync/list_pages_gen.go b/internal/service/appsync/list_pages_gen.go index 9b00855361a..e91b9807591 100644 --- a/internal/service/appsync/list_pages_gen.go +++ b/internal/service/appsync/list_pages_gen.go @@ -1,4 +1,4 @@ -// Code generated by "internal/generate/listpages/main.go -AWSSDKVersion=2 -ListOps=ListApiKeys"; DO NOT EDIT. +// Code generated by "internal/generate/listpages/main.go -AWSSDKVersion=2 -ListOps=ListApiKeys,ListDomainNames,ListGraphqlApis"; DO NOT EDIT. package appsync @@ -25,3 +25,35 @@ func listAPIKeysPages(ctx context.Context, conn *appsync.Client, input *appsync. } return nil } +func listDomainNamesPages(ctx context.Context, conn *appsync.Client, input *appsync.ListDomainNamesInput, fn func(*appsync.ListDomainNamesOutput, bool) bool) error { + for { + output, err := conn.ListDomainNames(ctx, input) + if err != nil { + return err + } + + lastPage := aws.ToString(output.NextToken) == "" + if !fn(output, lastPage) || lastPage { + break + } + + input.NextToken = output.NextToken + } + return nil +} +func listGraphQLAPIsPages(ctx context.Context, conn *appsync.Client, input *appsync.ListGraphqlApisInput, fn func(*appsync.ListGraphqlApisOutput, bool) bool) error { + for { + output, err := conn.ListGraphqlApis(ctx, input) + if err != nil { + return err + } + + lastPage := aws.ToString(output.NextToken) == "" + if !fn(output, lastPage) || lastPage { + break + } + + input.NextToken = output.NextToken + } + return nil +} diff --git a/internal/service/appsync/sweep.go b/internal/service/appsync/sweep.go index 459b5265365..5986a803766 100644 --- a/internal/service/appsync/sweep.go +++ b/internal/service/appsync/sweep.go @@ -7,12 +7,11 @@ import ( "fmt" "log" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/go-multierror" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/sweep" - "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv1" + "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2" ) func RegisterSweepers() { @@ -41,53 +40,42 @@ func sweepGraphQLAPIs(region string) error { if err != nil { return fmt.Errorf("Error getting client: %s", err) } - conn := client.AppSyncConn(ctx) - sweepResources := make([]sweep.Sweepable, 0) - var errs *multierror.Error - input := &appsync.ListGraphqlApisInput{} + conn := client.AppSyncClient(ctx) + sweepResources := make([]sweep.Sweepable, 0) - for { - output, err := conn.ListGraphqlApisWithContext(ctx, input) - if awsv1.SkipSweepError(err) { - log.Printf("[WARN] Skipping AppSync GraphQL API sweep for %s: %s", region, err) - return nil - } - - if err != nil { - err := fmt.Errorf("error reading AppSync GraphQL API: %w", err) - log.Printf("[ERROR] %s", err) - errs = multierror.Append(errs, err) - break + err = listGraphQLAPIsPages(ctx, conn, input, func(page *appsync.ListGraphqlApisOutput, lastPage bool) bool { + if page == nil { + return !lastPage } - for _, graphAPI := range output.GraphqlApis { - r := ResourceGraphQLAPI() + for _, v := range page.GraphqlApis { + r := resourceGraphQLAPI() d := r.Data(nil) - - id := aws.StringValue(graphAPI.ApiId) - d.SetId(id) + d.SetId(aws.ToString(v.ApiId)) sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client)) } - if aws.StringValue(output.NextToken) == "" { - break - } + return !lastPage + }) - input.NextToken = output.NextToken + if awsv2.SkipSweepError(err) { + log.Printf("[WARN] Skipping AppSync GraphQL API sweep for %s: %s", region, err) + return nil } - if err := sweep.SweepOrchestrator(ctx, sweepResources); err != nil { - errs = multierror.Append(errs, fmt.Errorf("error sweeping AppSync GraphQL API %s: %w", region, err)) + if err != nil { + return fmt.Errorf("error listing AppSync GraphQL APIs (%s): %w", region, err) } - if awsv1.SkipSweepError(err) { - log.Printf("[WARN] Skipping AppSync GraphQL API sweep for %s: %s", region, errs) - return nil + err = sweep.SweepOrchestrator(ctx, sweepResources) + + if err != nil { + return fmt.Errorf("error sweeping AppSync GraphQL APIs (%s): %w", region, err) } - return errs.ErrorOrNil() + return nil } func sweepDomainNames(region string) error { @@ -96,53 +84,42 @@ func sweepDomainNames(region string) error { if err != nil { return fmt.Errorf("Error getting client: %s", err) } - conn := client.AppSyncConn(ctx) - sweepResources := make([]sweep.Sweepable, 0) - var errs *multierror.Error - input := &appsync.ListDomainNamesInput{} + conn := client.AppSyncClient(ctx) + sweepResources := make([]sweep.Sweepable, 0) - for { - output, err := conn.ListDomainNamesWithContext(ctx, input) - if awsv1.SkipSweepError(err) { - log.Printf("[WARN] Skipping AppSync Domain Name sweep for %s: %s", region, err) - return nil - } - - if err != nil { - err := fmt.Errorf("error reading AppSync Domain Name: %w", err) - log.Printf("[ERROR] %s", err) - errs = multierror.Append(errs, err) - break + err = listDomainNamesPages(ctx, conn, input, func(page *appsync.ListDomainNamesOutput, lastPage bool) bool { + if page == nil { + return !lastPage } - for _, dm := range output.DomainNameConfigs { - r := ResourceDomainName() + for _, v := range page.DomainNameConfigs { + r := resourceDomainName() d := r.Data(nil) - - id := aws.StringValue(dm.DomainName) - d.SetId(id) + d.SetId(aws.ToString(v.DomainName)) sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client)) } - if aws.StringValue(output.NextToken) == "" { - break - } + return !lastPage + }) - input.NextToken = output.NextToken + if awsv2.SkipSweepError(err) { + log.Printf("[WARN] Skipping AppSync Domain Name sweep for %s: %s", region, err) + return nil } - if err := sweep.SweepOrchestrator(ctx, sweepResources); err != nil { - errs = multierror.Append(errs, fmt.Errorf("error sweeping AppSync Domain Name %s: %w", region, err)) + if err != nil { + return fmt.Errorf("error listing AppSync Domain Names (%s): %w", region, err) } - if awsv1.SkipSweepError(err) { - log.Printf("[WARN] Skipping AppSync Domain Name sweep for %s: %s", region, errs) - return nil + err = sweep.SweepOrchestrator(ctx, sweepResources) + + if err != nil { + return fmt.Errorf("error sweeping AppSync Domain Names (%s): %w", region, err) } - return errs.ErrorOrNil() + return nil } func sweepDomainNameAssociations(region string) error { @@ -151,51 +128,40 @@ func sweepDomainNameAssociations(region string) error { if err != nil { return fmt.Errorf("Error getting client: %s", err) } - conn := client.AppSyncConn(ctx) - sweepResources := make([]sweep.Sweepable, 0) - var errs *multierror.Error - input := &appsync.ListDomainNamesInput{} + conn := client.AppSyncClient(ctx) + sweepResources := make([]sweep.Sweepable, 0) - for { - output, err := conn.ListDomainNamesWithContext(ctx, input) - if awsv1.SkipSweepError(err) { - log.Printf("[WARN] Skipping AppSync Domain Name Association sweep for %s: %s", region, err) - return nil - } - - if err != nil { - err := fmt.Errorf("error reading AppSync Domain Name Association: %w", err) - log.Printf("[ERROR] %s", err) - errs = multierror.Append(errs, err) - break + err = listDomainNamesPages(ctx, conn, input, func(page *appsync.ListDomainNamesOutput, lastPage bool) bool { + if page == nil { + return !lastPage } - for _, dm := range output.DomainNameConfigs { - r := ResourceDomainNameAPIAssociation() + for _, v := range page.DomainNameConfigs { + r := resourceDomainNameAPIAssociation() d := r.Data(nil) - - id := aws.StringValue(dm.DomainName) - d.SetId(id) + d.SetId(aws.ToString(v.DomainName)) sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client)) } - if aws.StringValue(output.NextToken) == "" { - break - } + return !lastPage + }) - input.NextToken = output.NextToken + if awsv2.SkipSweepError(err) { + log.Printf("[WARN] Skipping AppSync Domain Name API Association sweep for %s: %s", region, err) + return nil } - if err := sweep.SweepOrchestrator(ctx, sweepResources); err != nil { - errs = multierror.Append(errs, fmt.Errorf("error sweeping AppSync Domain Name Association %s: %w", region, err)) + if err != nil { + return fmt.Errorf("error listing AppSync Domain Names (%s): %w", region, err) } - if awsv1.SkipSweepError(err) { - log.Printf("[WARN] Skipping AppSync Domain Name Association sweep for %s: %s", region, errs) - return nil + err = sweep.SweepOrchestrator(ctx, sweepResources) + + if err != nil { + return fmt.Errorf("error sweeping AppSync Domain Name API Associations (%s): %w", region, err) } - return errs.ErrorOrNil() + return nil } From 69541d2a32b415d467807714f30e6f8cd5e5535f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 09:24:46 -0400 Subject: [PATCH 017/208] Run 'make fix-constants PKG=appsync'. --- internal/service/appsync/type_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/appsync/type_test.go b/internal/service/appsync/type_test.go index 2888677c4f1..4decf95f45d 100644 --- a/internal/service/appsync/type_test.go +++ b/internal/service/appsync/type_test.go @@ -84,7 +84,7 @@ func testAccCheckTypeDestroy(ctx context.Context) resource.TestCheckFunc { continue } - _, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.Attributes["api_id"], awstypes.TypeDefinitionFormat(rs.Primary.Attributes["format"]), rs.Primary.Attributes["name"]) + _, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.Attributes["api_id"], awstypes.TypeDefinitionFormat(rs.Primary.Attributes[names.AttrFormat]), rs.Primary.Attributes[names.AttrName]) if tfresource.NotFound(err) { continue @@ -110,7 +110,7 @@ func testAccCheckTypeExists(ctx context.Context, n string, v *awstypes.Type) res conn := acctest.Provider.Meta().(*conns.AWSClient).AppSyncClient(ctx) - output, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.Attributes["api_id"], awstypes.TypeDefinitionFormat(rs.Primary.Attributes["format"]), rs.Primary.Attributes["name"]) + output, err := tfappsync.FindTypeByThreePartKey(ctx, conn, rs.Primary.Attributes["api_id"], awstypes.TypeDefinitionFormat(rs.Primary.Attributes[names.AttrFormat]), rs.Primary.Attributes[names.AttrName]) if err != nil { return err From 6bf8cd21e58a9c0ecbe68c1bd410a1260f5f4d1d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 09:25:48 -0400 Subject: [PATCH 018/208] Fix semgrep 'ci.aws-in-func-name'. --- internal/service/appsync/datasource.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/appsync/datasource.go b/internal/service/appsync/datasource.go index a7d5c584192..b520af2976f 100644 --- a/internal/service/appsync/datasource.go +++ b/internal/service/appsync/datasource.go @@ -717,7 +717,7 @@ func expandAuthorizationConfig(tfList []interface{}) *awstypes.AuthorizationConf } if v, ok := tfMap["aws_iam_config"].([]interface{}); ok && len(v) > 0 { - apiObject.AwsIamConfig = expandAWSIAMConfig(v) + apiObject.AwsIamConfig = expandIAMConfig(v) } return apiObject @@ -733,13 +733,13 @@ func flattenAuthorizationConfig(apiObject *awstypes.AuthorizationConfig) []inter } if apiObject.AwsIamConfig != nil { - tfMap["aws_iam_config"] = flattenAWSIAMConfig(apiObject.AwsIamConfig) + tfMap["aws_iam_config"] = flattenIAMConfig(apiObject.AwsIamConfig) } return []interface{}{tfMap} } -func expandAWSIAMConfig(tfList []interface{}) *awstypes.AwsIamConfig { +func expandIAMConfig(tfList []interface{}) *awstypes.AwsIamConfig { if len(tfList) == 0 || tfList[0] == nil { return nil } @@ -758,7 +758,7 @@ func expandAWSIAMConfig(tfList []interface{}) *awstypes.AwsIamConfig { return apiObject } -func flattenAWSIAMConfig(apiObject *awstypes.AwsIamConfig) []interface{} { +func flattenIAMConfig(apiObject *awstypes.AwsIamConfig) []interface{} { if apiObject == nil { return nil } From f618750f18f5075b0c8c0b6a7d72f65f641713dd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 09:28:43 -0400 Subject: [PATCH 019/208] Fix semgrep 'ci.typed-enum-conversion'. --- internal/service/appsync/type.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/appsync/type.go b/internal/service/appsync/type.go index ab162bda7fd..b208a850a52 100644 --- a/internal/service/appsync/type.go +++ b/internal/service/appsync/type.go @@ -173,7 +173,7 @@ func resourceTypeDelete(ctx context.Context, d *schema.ResourceData, meta interf const typeResourceIDSeparator = ":" func typeCreateResourceID(apiID string, format awstypes.TypeDefinitionFormat, name string) string { - parts := []string{apiID, string(format), name} + parts := []string{apiID, string(format), name} // nosemgrep:ci.typed-enum-conversion id := strings.Join(parts, typeResourceIDSeparator) return id From e9bdc501202a97824ec9cd262489e1312196b337 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:31:25 -0400 Subject: [PATCH 020/208] Fix golangci-lint 'unparam'. --- internal/service/appsync/api_cache.go | 2 +- internal/service/appsync/domain_name_api_association.go | 2 +- internal/service/appsync/resolver.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/appsync/api_cache.go b/internal/service/appsync/api_cache.go index 88c3e04dd34..dd8ad2f6f81 100644 --- a/internal/service/appsync/api_cache.go +++ b/internal/service/appsync/api_cache.go @@ -226,7 +226,7 @@ func statusAPICache(ctx context.Context, conn *appsync.Client, name string) retr } } -func waitAPICacheAvailable(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiCache, error) { +func waitAPICacheAvailable(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiCache, error) { //nolint:unparam const ( timeout = 60 * time.Minute ) diff --git a/internal/service/appsync/domain_name_api_association.go b/internal/service/appsync/domain_name_api_association.go index 2baafc64ee4..32e0d3dc016 100644 --- a/internal/service/appsync/domain_name_api_association.go +++ b/internal/service/appsync/domain_name_api_association.go @@ -183,7 +183,7 @@ func statusDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, i } } -func waitDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiAssociation, error) { +func waitDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, id string) (*awstypes.ApiAssociation, error) { //nolint:unparam const ( domainNameAPIAssociationTimeout = 60 * time.Minute ) diff --git a/internal/service/appsync/resolver.go b/internal/service/appsync/resolver.go index 431dea16d78..772de89f585 100644 --- a/internal/service/appsync/resolver.go +++ b/internal/service/appsync/resolver.go @@ -406,7 +406,7 @@ func resolverParseResourceID(id string) (string, string, string, error) { return parts[0], parts[1], parts[2], nil } -func retryResolverOp(ctx context.Context, apiID string, f func() (interface{}, error)) (interface{}, error) { +func retryResolverOp(ctx context.Context, apiID string, f func() (interface{}, error)) (interface{}, error) { //nolint:unparam mutexKey := "appsync-schema-" + apiID conns.GlobalMutexKV.Lock(mutexKey) defer conns.GlobalMutexKV.Unlock(mutexKey) From b290008ee2bc9f39481d52c22fb38d0dbde54d8d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:05 -0400 Subject: [PATCH 021/208] go get github.com/aws/aws-sdk-go-v2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d9399e02452..db9e84e114a 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/YakDriver/go-version v0.1.0 github.com/YakDriver/regexache v0.23.0 github.com/aws/aws-sdk-go v1.54.4 - github.com/aws/aws-sdk-go-v2 v1.29.0 + github.com/aws/aws-sdk-go-v2 v1.30.0 github.com/aws/aws-sdk-go-v2/config v1.27.20 github.com/aws/aws-sdk-go-v2/credentials v1.17.20 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.7 diff --git a/go.sum b/go.sum index 1821f657ea0..c1261061027 100644 --- a/go.sum +++ b/go.sum @@ -24,8 +24,8 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go v1.54.4 h1:xZga3fPu7uxVgh83DIaQlb7r0cixFx1xKiiROTWAhpU= github.com/aws/aws-sdk-go v1.54.4/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= -github.com/aws/aws-sdk-go-v2 v1.29.0 h1:uMlEecEwgp2gs6CsM6ugquNHr6mg0LHylPBR8u5Ojac= -github.com/aws/aws-sdk-go-v2 v1.29.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= +github.com/aws/aws-sdk-go-v2 v1.30.0 h1:6qAwtzlfcTtcL8NHtbDQAqgM5s6NDipQTkPxyH/6kAA= +github.com/aws/aws-sdk-go-v2 v1.30.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2/go.mod h1:lPprDr1e6cJdyYeGXnRaJoP4Md+cDBvi2eOj00BlGmg= github.com/aws/aws-sdk-go-v2/config v1.27.20 h1:oQSn/KNUMV54X0FBEDQQ2ymNfcKyMT81ar8gyvMzzqs= From 705a0d5f8342b1da1f2ac08dcf4bfa55c8f4898f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:06 -0400 Subject: [PATCH 022/208] go get github.com/aws/aws-sdk-go-v2/config. --- go.mod | 18 +++++++++--------- go.sum | 36 ++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index db9e84e114a..bb02691e270 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/YakDriver/regexache v0.23.0 github.com/aws/aws-sdk-go v1.54.4 github.com/aws/aws-sdk-go-v2 v1.30.0 - github.com/aws/aws-sdk-go-v2/config v1.27.20 - github.com/aws/aws-sdk-go-v2/credentials v1.17.20 - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.7 + github.com/aws/aws-sdk-go-v2/config v1.27.21 + github.com/aws/aws-sdk-go-v2/credentials v1.17.21 + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.0 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.0 github.com/aws/aws-sdk-go-v2/service/account v1.18.0 @@ -177,9 +177,9 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.0 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0 - github.com/aws/aws-sdk-go-v2/service/sso v1.21.0 + github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.0 - github.com/aws/aws-sdk-go-v2/service/sts v1.29.0 + github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 github.com/aws/aws-sdk-go-v2/service/swf v1.24.0 github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.0 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.0 @@ -249,16 +249,16 @@ require ( github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/armon/go-radix v1.0.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.11 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.11 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.11 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.13 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.12 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.13 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.11 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/boombuler/barcode v1.0.1 // indirect github.com/bufbuild/protocompile v0.6.0 // indirect diff --git a/go.sum b/go.sum index c1261061027..d1637bd7b06 100644 --- a/go.sum +++ b/go.sum @@ -28,18 +28,18 @@ github.com/aws/aws-sdk-go-v2 v1.30.0 h1:6qAwtzlfcTtcL8NHtbDQAqgM5s6NDipQTkPxyH/6 github.com/aws/aws-sdk-go-v2 v1.30.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2/go.mod h1:lPprDr1e6cJdyYeGXnRaJoP4Md+cDBvi2eOj00BlGmg= -github.com/aws/aws-sdk-go-v2/config v1.27.20 h1:oQSn/KNUMV54X0FBEDQQ2ymNfcKyMT81ar8gyvMzzqs= -github.com/aws/aws-sdk-go-v2/config v1.27.20/go.mod h1:IbEMotJrWc3Bh7++HXZDlviHZP7kHrkHU3PNl9e17po= -github.com/aws/aws-sdk-go-v2/credentials v1.17.20 h1:VYTCplAeOeBv5InTtrmF61OIwD4aHKryg3KZ6hf7dsI= -github.com/aws/aws-sdk-go-v2/credentials v1.17.20/go.mod h1:ktubcFYvbN8++72jVM9IJoQH6Q2TP+Z7r2VbV1AaESU= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.7 h1:54QUEXjkE1SlxHmRA3gBXA52j/ZSAgdOfAFGv1NsPCY= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.7/go.mod h1:bQRjJsdSMzmo/qbtGeBtPbIMp1IgQ+9R9jYJLm12uJA= +github.com/aws/aws-sdk-go-v2/config v1.27.21 h1:yPX3pjGCe2hJsetlmGNB4Mngu7UPmvWPzzWCv1+boeM= +github.com/aws/aws-sdk-go-v2/config v1.27.21/go.mod h1:4XtlEU6DzNai8RMbjSF5MgGZtYvrhBP/aKZcRtZAVdM= +github.com/aws/aws-sdk-go-v2/credentials v1.17.21 h1:pjAqgzfgFhTv5grc7xPHtXCAaMapzmwA7aU+c/SZQGw= +github.com/aws/aws-sdk-go-v2/credentials v1.17.21/go.mod h1:nhK6PtBlfHTUDVmBLr1dg+WHCOCK+1Fu/WQyVHPsgNQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8 h1:FR+oWPFb/8qMVYMWN98bUZAGqPvLHiyqg1wqQGfUAXY= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8/go.mod h1:EgSKcHiuuakEIxJcKGzVNWh5srVAQ3jKaSrBGRYvM48= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.0 h1:51p4kCxB/9+QvBtg0KfwgTu10yiHuB9SrjbUE0d/vgw= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.0/go.mod h1:FtmZRmuRxdLBk4P/JcvZncfbwvLobQYktVaVAF8cx9A= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.11 h1:ltkhl3I9ddcRR3Dsy+7bOFFq546O8OYsfNEXVIyuOSE= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.11/go.mod h1:H4D8JoCFNJwnT7U5U8iwgG24n71Fx2I/ZP/18eYFr9g= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.11 h1:+BgX2AY7yV4ggSwa80z/yZIJX+e0jnNxjMLVyfpSXM0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.11/go.mod h1:DlBATBSDCz30BCdRFldmyLsAzJwi2pdQ+YSdJTHhTUI= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 h1:SJ04WXGTwnHlWIODtC5kJzKbeuHt+OUNOgKg7nfnUGw= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12/go.mod h1:FkpvXhA92gb3GE9LD6Og0pHHycTxW7xGpnEh5E7Opwo= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 h1:hb5KgeYfObi5MHkSSZMEudnIvX30iB+E21evI4r6BnQ= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12/go.mod h1:CroKe/eWJdyfy9Vx4rljP5wTUjNJfb+fPz1uMYUhEGM= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.11 h1:jJ2dythFP5oNunvwc3gBsINl3ZPt/InVm4a5OAr3tag= @@ -244,8 +244,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.13 h1:zmKtGN1dMQDVBs github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.13/go.mod h1:1UzMv5n56AjbPR9834o5YLw5dH6baIsY60Ib84s1NCc= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.12 h1:IXSDCqEfL4oe4plEt0GkjkuI9T3tbVH91udMp7ZwV20= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.12/go.mod h1:47OjVuK2ib5x+7RLlacLxhZRlTnjlXAwal1BSXwj7Tk= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.13 h1:3A8vxp65nZy6aMlSCBvpIyxIbAN0DOSxaPDZuzasxuU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.13/go.mod h1:IxJ/pMQ/Y+MDFGo6pQRyqzKKwtGMHb5IWp5PXSQr8dM= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 h1:zSDPny/pVnkqABXYRicYuPf9z2bTqfH13HT3v6UheIk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14/go.mod h1:3TTcI5JSzda1nw/pkVC9dhgLre0SNBFj2lYS4GctXKI= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.11 h1:QNkz5KqOUdeq1D0AP9r7Af6hNKyb0fnFa/L4DEKTp+Q= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.11/go.mod h1:c7R1eDLOU5hQ4f66TYzyAT2AeLLtw5khZJpbGCo1cYU= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.0 h1:qhosmDiiChXUik7EonQCa/Ar86wkN+RNJtrvw038FBc= @@ -384,14 +384,14 @@ github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0 h1:z9+1A3GPG1fK93uGvon github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0/go.mod h1:/ZlBCvFGploAXe+70lJ5B56ZiFsMJ9dtKjVl2nw1YSA= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0 h1:hPwOshVCyWuinI9fAhJsY8HYl9EvPX8VfoQvUyxk5Dw= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0/go.mod h1:UwEu2wMK9SX1hpj5a6Vvq/xqFHq9iDdkvOXY8yzlw/s= -github.com/aws/aws-sdk-go-v2/service/sso v1.21.0 h1:P0zUA+5liaoNILI/btBBQHC09PFPyRJr+w+Xt9KHKck= -github.com/aws/aws-sdk-go-v2/service/sso v1.21.0/go.mod h1:0bmRzdsq9/iNyP02H4UV0ZRjFx6qQBqRvfCJ4trFgjE= +github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 h1:sd0BsnAvLH8gsp2e3cbaIr+9D7T1xugueQ7V/zUAsS4= +github.com/aws/aws-sdk-go-v2/service/sso v1.21.1/go.mod h1:lcQG/MmxydijbeTOp04hIuJwXGWPZGI3bwdFDGRTv14= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.0 h1:EqRK4n81uTTWxi337dAtJ0hc+y/bb0BZmdvsMIQnO2k= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.0/go.mod h1:PwPJuZ11g2G1p93H7eho8tDWF9dKeKC5LSdHoQiMKo0= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.0 h1:jPV8U9r3msO9ECm9geW8PGjU/rz8vfPTPmIBbA83W3M= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.0/go.mod h1:B3G77bQDCmhp0RV0P/J9Kd4/qsymdWVhzTe3btAtywE= -github.com/aws/aws-sdk-go-v2/service/sts v1.29.0 h1:dqW4XRwPE/poWSqVntpeXLHzpPK6AOfKmL9QWDYl9aw= -github.com/aws/aws-sdk-go-v2/service/sts v1.29.0/go.mod h1:j8+hrxlmLR8ZQo6ytTAls/JFrt5bVisuS6PD8gw2VBw= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1 h1:1uEFNNskK/I1KoZ9Q8wJxMz5V9jyBlsiaNrM7vA3YUQ= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1/go.mod h1:z0P8K+cBIsFXUr5rzo/psUeJ20XjPN0+Nn8067Nd+E4= +github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 h1:myX5CxqXE0QMZNja6FA1/FSE3Vu1rVmeUmpJMMzeZg0= +github.com/aws/aws-sdk-go-v2/service/sts v1.29.1/go.mod h1:N2mQiucsO0VwK9CYuS4/c2n6Smeh1v47Rz3dWCPFLdE= github.com/aws/aws-sdk-go-v2/service/swf v1.24.0 h1:YgPeQKzzVAaWRtwj/ovFoEnihwwjYz8M0Wi9OC33btc= github.com/aws/aws-sdk-go-v2/service/swf v1.24.0/go.mod h1:2d8TknRULCwm+Z3SRJAc+RKXH69TRaKZX3tra+atvRg= github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.0 h1:Y/GdHJ3dQughvff9znLmc0ll/z4XKq7AFt49eS9cdL0= From f54ccb6ed0c60ad9818c422dd62450bbad856e5f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:08 -0400 Subject: [PATCH 023/208] go get github.com/aws/aws-sdk-go-v2/feature/s3/manager. --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index bb02691e270..73a75786646 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.27.21 github.com/aws/aws-sdk-go-v2/credentials v1.17.21 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.0 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.1 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.0 github.com/aws/aws-sdk-go-v2/service/account v1.18.0 github.com/aws/aws-sdk-go-v2/service/acm v1.27.0 @@ -158,7 +158,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.0 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0 github.com/aws/aws-sdk-go-v2/service/rum v1.18.0 - github.com/aws/aws-sdk-go-v2/service/s3 v1.56.0 + github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 github.com/aws/aws-sdk-go-v2/service/s3control v1.45.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.0 github.com/aws/aws-sdk-go-v2/service/schemas v1.25.0 @@ -252,12 +252,12 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.11 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.13 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.14 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.12 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.11 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/boombuler/barcode v1.0.1 // indirect diff --git a/go.sum b/go.sum index d1637bd7b06..369047aa0c2 100644 --- a/go.sum +++ b/go.sum @@ -34,16 +34,16 @@ github.com/aws/aws-sdk-go-v2/credentials v1.17.21 h1:pjAqgzfgFhTv5grc7xPHtXCAaMa github.com/aws/aws-sdk-go-v2/credentials v1.17.21/go.mod h1:nhK6PtBlfHTUDVmBLr1dg+WHCOCK+1Fu/WQyVHPsgNQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8 h1:FR+oWPFb/8qMVYMWN98bUZAGqPvLHiyqg1wqQGfUAXY= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8/go.mod h1:EgSKcHiuuakEIxJcKGzVNWh5srVAQ3jKaSrBGRYvM48= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.0 h1:51p4kCxB/9+QvBtg0KfwgTu10yiHuB9SrjbUE0d/vgw= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.0/go.mod h1:FtmZRmuRxdLBk4P/JcvZncfbwvLobQYktVaVAF8cx9A= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.1 h1:D9VqWMuw7lJAX6d5eINfRQ/PkvtcJAK3Qmd6f6xEeUw= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.1/go.mod h1:ckvBx7codI4wzc5inOfDp5ZbK7TjMFa7eXwmLvXQrRk= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 h1:SJ04WXGTwnHlWIODtC5kJzKbeuHt+OUNOgKg7nfnUGw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12/go.mod h1:FkpvXhA92gb3GE9LD6Og0pHHycTxW7xGpnEh5E7Opwo= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 h1:hb5KgeYfObi5MHkSSZMEudnIvX30iB+E21evI4r6BnQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12/go.mod h1:CroKe/eWJdyfy9Vx4rljP5wTUjNJfb+fPz1uMYUhEGM= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.11 h1:jJ2dythFP5oNunvwc3gBsINl3ZPt/InVm4a5OAr3tag= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.11/go.mod h1:SNkot0zeLtgjP54/6BGuyG12pBcXi77jV5nbEsPgPzg= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12 h1:DXFWyt7ymx/l1ygdyTTS0X923e+Q2wXIxConJzrgwc0= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12/go.mod h1:mVOr/LbvaNySK1/BTy4cBOCjhCNY2raWBwK4v+WR5J4= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.0 h1:sM+N/AhxM0oPE2A+8iTYQ+jtYw4guFv+M37NSN3IUNM= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.0/go.mod h1:AbqbSr5/I8pLape+l0cXw8huuLmmW6hbk+NJzPiV8lg= github.com/aws/aws-sdk-go-v2/service/account v1.18.0 h1:+pXg+HCr8fs/Y+yLuiALewjJ17xluA3d4Y7MvY8Ntt8= @@ -240,14 +240,14 @@ github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0 h1:X6iYhpr/T3elhQ+Kvnx8H github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0/go.mod h1:P3o/FYtRp9xLTWmIxZHgiZ7IMFc6naXeBeZANkms7DI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.13 h1:zmKtGN1dMQDVBsfCePykMQmTfWY+jlaUTv55RF5b31w= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.13/go.mod h1:1UzMv5n56AjbPR9834o5YLw5dH6baIsY60Ib84s1NCc= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.14 h1:oWccitSnByVU74rQRHac4gLfDqjB6Z1YQGOY/dXKedI= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.14/go.mod h1:8SaZBlQdCLrc/2U3CEO48rYj9uR8qRsPRkmzwNM52pM= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.12 h1:IXSDCqEfL4oe4plEt0GkjkuI9T3tbVH91udMp7ZwV20= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.12/go.mod h1:47OjVuK2ib5x+7RLlacLxhZRlTnjlXAwal1BSXwj7Tk= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 h1:zSDPny/pVnkqABXYRicYuPf9z2bTqfH13HT3v6UheIk= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14/go.mod h1:3TTcI5JSzda1nw/pkVC9dhgLre0SNBFj2lYS4GctXKI= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.11 h1:QNkz5KqOUdeq1D0AP9r7Af6hNKyb0fnFa/L4DEKTp+Q= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.11/go.mod h1:c7R1eDLOU5hQ4f66TYzyAT2AeLLtw5khZJpbGCo1cYU= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12 h1:tzha+v1SCEBpXWEuw6B/+jm4h5z8hZbTpXz0zRZqTnw= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12/go.mod h1:n+nt2qjHGoseWeLHt1vEr6ZRCCxIN2KcNpJxBcYQSwI= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.0 h1:qhosmDiiChXUik7EonQCa/Ar86wkN+RNJtrvw038FBc= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.0/go.mod h1:k4kMkKa2GC60pwx/7o9Lo1FafY/IweWPzEJDly2q5Q0= github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.0 h1:tat1j8oYFZ3U+RjCPAsG2v/EeNA0tjNFFN/vejX7mYI= @@ -346,8 +346,8 @@ github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0 h1:+RSaYW0xatoiE7wGJ github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0/go.mod h1:b93TJwGXxTHjsiJ0atSd1B1SS+t+f0reUP1NpSm5pCY= github.com/aws/aws-sdk-go-v2/service/rum v1.18.0 h1:nSB1+P1J8uhiktco2Q2YHS6QKnmvUTMxLQsi8ToV6fA= github.com/aws/aws-sdk-go-v2/service/rum v1.18.0/go.mod h1:uF2wf6A021PjiTu0/JUkme349nPtPSYHHtxlustC4QI= -github.com/aws/aws-sdk-go-v2/service/s3 v1.56.0 h1:NZIFz15bhrWwewGU0tdUGsisKPQxvzy3O4dL5jgBDKw= -github.com/aws/aws-sdk-go-v2/service/s3 v1.56.0/go.mod h1:ha/DkVoeDtS0XwRKyOiXP2J4Vzo3zpiE0yGi7Ej0X3o= +github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 h1:wsg9Z/vNnCmxWikfGIoOlnExtEU459cR+2d+iDJ8elo= +github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1/go.mod h1:8rDw3mVwmvIWWX/+LWY3PPIMZuwnQdJMCt0iVFVT3qw= github.com/aws/aws-sdk-go-v2/service/s3control v1.45.0 h1:pY/fn04jwUb3WfjWNNGdt3uAT7ZwBx/qz4S5gKWvfpc= github.com/aws/aws-sdk-go-v2/service/s3control v1.45.0/go.mod h1:6cnOOx7AsrCBX6NlwKmGYi5fz385yqFJxQwBGMDyc6A= github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.0 h1:rS3lP/TQoPU2rnw3edOtSkvTtOQox64KAeTuArky5cg= From 4d3f0b0f31d1c17af3015a7cca79aa468aff6b1f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:09 -0400 Subject: [PATCH 024/208] go get github.com/aws/aws-sdk-go-v2/service/accessanalyzer. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 73a75786646..ffe8fe14cbf 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.17.21 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.1 - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.0 + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.1 github.com/aws/aws-sdk-go-v2/service/account v1.18.0 github.com/aws/aws-sdk-go-v2/service/acm v1.27.0 github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.0 diff --git a/go.sum b/go.sum index 369047aa0c2..336a0e5aff9 100644 --- a/go.sum +++ b/go.sum @@ -44,8 +44,8 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12 h1:DXFWyt7ymx/l1ygdyTTS0X923e+Q2wXIxConJzrgwc0= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12/go.mod h1:mVOr/LbvaNySK1/BTy4cBOCjhCNY2raWBwK4v+WR5J4= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.0 h1:sM+N/AhxM0oPE2A+8iTYQ+jtYw4guFv+M37NSN3IUNM= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.0/go.mod h1:AbqbSr5/I8pLape+l0cXw8huuLmmW6hbk+NJzPiV8lg= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.1 h1:xiBxyVn3snq4T4ULkhluYUDouVWa0/bvCacJaaW5Zaw= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.1/go.mod h1:joyQCMQ4RuIAyFlaxemD0fvhbfv+A+j8OdMUJHpyxWk= github.com/aws/aws-sdk-go-v2/service/account v1.18.0 h1:+pXg+HCr8fs/Y+yLuiALewjJ17xluA3d4Y7MvY8Ntt8= github.com/aws/aws-sdk-go-v2/service/account v1.18.0/go.mod h1:4BVmMMaWjTz/Qb4wgcGF9WKNB5xbUvbEYQ1dV28Cjtc= github.com/aws/aws-sdk-go-v2/service/acm v1.27.0 h1:TMHvKbOxYvIOWQjKjXKGWYiLHC0PsWO90+5Q19jaZW4= From d33aa0d6df0fd2d02b140cd066f32f3ba4de30bd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:10 -0400 Subject: [PATCH 025/208] go get github.com/aws/aws-sdk-go-v2/service/account. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ffe8fe14cbf..aca32711829 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.1 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.1 - github.com/aws/aws-sdk-go-v2/service/account v1.18.0 + github.com/aws/aws-sdk-go-v2/service/account v1.18.1 github.com/aws/aws-sdk-go-v2/service/acm v1.27.0 github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.0 github.com/aws/aws-sdk-go-v2/service/amp v1.26.0 diff --git a/go.sum b/go.sum index 336a0e5aff9..cc46dbdbf19 100644 --- a/go.sum +++ b/go.sum @@ -46,8 +46,8 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12 h1:DXFWyt7ymx/l1ygdyTTS0X923e+ github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12/go.mod h1:mVOr/LbvaNySK1/BTy4cBOCjhCNY2raWBwK4v+WR5J4= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.1 h1:xiBxyVn3snq4T4ULkhluYUDouVWa0/bvCacJaaW5Zaw= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.1/go.mod h1:joyQCMQ4RuIAyFlaxemD0fvhbfv+A+j8OdMUJHpyxWk= -github.com/aws/aws-sdk-go-v2/service/account v1.18.0 h1:+pXg+HCr8fs/Y+yLuiALewjJ17xluA3d4Y7MvY8Ntt8= -github.com/aws/aws-sdk-go-v2/service/account v1.18.0/go.mod h1:4BVmMMaWjTz/Qb4wgcGF9WKNB5xbUvbEYQ1dV28Cjtc= +github.com/aws/aws-sdk-go-v2/service/account v1.18.1 h1:GRinAnafboH983+FkLjFO1eMOa3+TcgjQvqb0JMDE4M= +github.com/aws/aws-sdk-go-v2/service/account v1.18.1/go.mod h1:E9NGq+OLfDPiiLj3cl+4srGmNYytb/UB2DPEGvEhAQI= github.com/aws/aws-sdk-go-v2/service/acm v1.27.0 h1:TMHvKbOxYvIOWQjKjXKGWYiLHC0PsWO90+5Q19jaZW4= github.com/aws/aws-sdk-go-v2/service/acm v1.27.0/go.mod h1:yNwraJajyXG0CXINndTEJjBRe6mztLyGuwxXRR9Mhpc= github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.0 h1:Wptawuh60SdMXHHVfKDj53JMHzzAS5M+TMwv8bI2RmM= From 1c97600e8f9c3a849c5d9277fd21ae8b26813189 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:11 -0400 Subject: [PATCH 026/208] go get github.com/aws/aws-sdk-go-v2/service/acm. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index aca32711829..63eee0977cd 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.1 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.1 github.com/aws/aws-sdk-go-v2/service/account v1.18.1 - github.com/aws/aws-sdk-go-v2/service/acm v1.27.0 + github.com/aws/aws-sdk-go-v2/service/acm v1.27.1 github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.0 github.com/aws/aws-sdk-go-v2/service/amp v1.26.0 github.com/aws/aws-sdk-go-v2/service/amplify v1.22.0 diff --git a/go.sum b/go.sum index cc46dbdbf19..6583d4ff734 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,8 @@ github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.1 h1:xiBxyVn3snq4T4ULk github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.1/go.mod h1:joyQCMQ4RuIAyFlaxemD0fvhbfv+A+j8OdMUJHpyxWk= github.com/aws/aws-sdk-go-v2/service/account v1.18.1 h1:GRinAnafboH983+FkLjFO1eMOa3+TcgjQvqb0JMDE4M= github.com/aws/aws-sdk-go-v2/service/account v1.18.1/go.mod h1:E9NGq+OLfDPiiLj3cl+4srGmNYytb/UB2DPEGvEhAQI= -github.com/aws/aws-sdk-go-v2/service/acm v1.27.0 h1:TMHvKbOxYvIOWQjKjXKGWYiLHC0PsWO90+5Q19jaZW4= -github.com/aws/aws-sdk-go-v2/service/acm v1.27.0/go.mod h1:yNwraJajyXG0CXINndTEJjBRe6mztLyGuwxXRR9Mhpc= +github.com/aws/aws-sdk-go-v2/service/acm v1.27.1 h1:EMnuoQ/WR4/VNE8QmFrXq4u0BZH2Xhc9Yr41xZlths0= +github.com/aws/aws-sdk-go-v2/service/acm v1.27.1/go.mod h1:wHw2SsqkXuys0SArqz+Rb7LGvujWSnlPByxCm6q7kus= github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.0 h1:Wptawuh60SdMXHHVfKDj53JMHzzAS5M+TMwv8bI2RmM= github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.0/go.mod h1:i1DwOkVvZwXG1iZZGoFV+dpM2YZXwD/iK62HRDMGnC4= github.com/aws/aws-sdk-go-v2/service/amp v1.26.0 h1:0Jagg+Frwq6spIAqhlL1MGaiN88iNWIaNl7Tfi3auSM= From db1f414d1d412cc5c3479394b810fbf261fe9b15 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:11 -0400 Subject: [PATCH 027/208] go get github.com/aws/aws-sdk-go-v2/service/acmpca. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 63eee0977cd..4a062c0de09 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.1 github.com/aws/aws-sdk-go-v2/service/account v1.18.1 github.com/aws/aws-sdk-go-v2/service/acm v1.27.1 - github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.0 + github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.1 github.com/aws/aws-sdk-go-v2/service/amp v1.26.0 github.com/aws/aws-sdk-go-v2/service/amplify v1.22.0 github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.0 diff --git a/go.sum b/go.sum index 6583d4ff734..32587880f7a 100644 --- a/go.sum +++ b/go.sum @@ -50,8 +50,8 @@ github.com/aws/aws-sdk-go-v2/service/account v1.18.1 h1:GRinAnafboH983+FkLjFO1eM github.com/aws/aws-sdk-go-v2/service/account v1.18.1/go.mod h1:E9NGq+OLfDPiiLj3cl+4srGmNYytb/UB2DPEGvEhAQI= github.com/aws/aws-sdk-go-v2/service/acm v1.27.1 h1:EMnuoQ/WR4/VNE8QmFrXq4u0BZH2Xhc9Yr41xZlths0= github.com/aws/aws-sdk-go-v2/service/acm v1.27.1/go.mod h1:wHw2SsqkXuys0SArqz+Rb7LGvujWSnlPByxCm6q7kus= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.0 h1:Wptawuh60SdMXHHVfKDj53JMHzzAS5M+TMwv8bI2RmM= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.0/go.mod h1:i1DwOkVvZwXG1iZZGoFV+dpM2YZXwD/iK62HRDMGnC4= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.1 h1:FAk92O6prrubKEZOPq1EaB09B3G7crDIrmSiRdcQDrY= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.1/go.mod h1:5GKFDOiJPtkP6jyRx8AB0vRap2JYPyD5pKJQALHIn9s= github.com/aws/aws-sdk-go-v2/service/amp v1.26.0 h1:0Jagg+Frwq6spIAqhlL1MGaiN88iNWIaNl7Tfi3auSM= github.com/aws/aws-sdk-go-v2/service/amp v1.26.0/go.mod h1:9tLXwv/RtSeYC+dCJYE4ung6GVaWlBDqNgGBGK3iUqk= github.com/aws/aws-sdk-go-v2/service/amplify v1.22.0 h1:PN8oZ7yRpzFAyx9iSX1xlwtxsWaIVvncW4iYisqGaDA= From bed1c34b722ba220966d19ba5bc133326df15ca2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:12 -0400 Subject: [PATCH 028/208] go get github.com/aws/aws-sdk-go-v2/service/amp. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4a062c0de09..f9017b07354 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/account v1.18.1 github.com/aws/aws-sdk-go-v2/service/acm v1.27.1 github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.1 - github.com/aws/aws-sdk-go-v2/service/amp v1.26.0 + github.com/aws/aws-sdk-go-v2/service/amp v1.26.1 github.com/aws/aws-sdk-go-v2/service/amplify v1.22.0 github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.0 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.0 diff --git a/go.sum b/go.sum index 32587880f7a..7a3dc3701f3 100644 --- a/go.sum +++ b/go.sum @@ -52,8 +52,8 @@ github.com/aws/aws-sdk-go-v2/service/acm v1.27.1 h1:EMnuoQ/WR4/VNE8QmFrXq4u0BZH2 github.com/aws/aws-sdk-go-v2/service/acm v1.27.1/go.mod h1:wHw2SsqkXuys0SArqz+Rb7LGvujWSnlPByxCm6q7kus= github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.1 h1:FAk92O6prrubKEZOPq1EaB09B3G7crDIrmSiRdcQDrY= github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.1/go.mod h1:5GKFDOiJPtkP6jyRx8AB0vRap2JYPyD5pKJQALHIn9s= -github.com/aws/aws-sdk-go-v2/service/amp v1.26.0 h1:0Jagg+Frwq6spIAqhlL1MGaiN88iNWIaNl7Tfi3auSM= -github.com/aws/aws-sdk-go-v2/service/amp v1.26.0/go.mod h1:9tLXwv/RtSeYC+dCJYE4ung6GVaWlBDqNgGBGK3iUqk= +github.com/aws/aws-sdk-go-v2/service/amp v1.26.1 h1:svGkgUKZDc5SNSiP6BgcOe/6sPmwBniltU6uHmxrjqo= +github.com/aws/aws-sdk-go-v2/service/amp v1.26.1/go.mod h1:mBtHxQRTrzQB0G5oap7IcgP9Ny5p9BJSGhWnuQ+35EY= github.com/aws/aws-sdk-go-v2/service/amplify v1.22.0 h1:PN8oZ7yRpzFAyx9iSX1xlwtxsWaIVvncW4iYisqGaDA= github.com/aws/aws-sdk-go-v2/service/amplify v1.22.0/go.mod h1:eB7zMwDOZm527WOxYKa7VyHLp8dcVEUD9JpCczepKhs= github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.0 h1:Cos+utTtPG8mSuYTEyetXJdYsRzSqN09Z4Kv/rDgf2E= From c2b6796ac8f4a1b46c962112f90f19e3df9176f1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:13 -0400 Subject: [PATCH 029/208] go get github.com/aws/aws-sdk-go-v2/service/amplify. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f9017b07354..36d54e66850 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/acm v1.27.1 github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.1 github.com/aws/aws-sdk-go-v2/service/amp v1.26.1 - github.com/aws/aws-sdk-go-v2/service/amplify v1.22.0 + github.com/aws/aws-sdk-go-v2/service/amplify v1.22.1 github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.0 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.0 github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.0 diff --git a/go.sum b/go.sum index 7a3dc3701f3..69ad66e96a1 100644 --- a/go.sum +++ b/go.sum @@ -54,8 +54,8 @@ github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.1 h1:FAk92O6prrubKEZOPq1EaB09B github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.1/go.mod h1:5GKFDOiJPtkP6jyRx8AB0vRap2JYPyD5pKJQALHIn9s= github.com/aws/aws-sdk-go-v2/service/amp v1.26.1 h1:svGkgUKZDc5SNSiP6BgcOe/6sPmwBniltU6uHmxrjqo= github.com/aws/aws-sdk-go-v2/service/amp v1.26.1/go.mod h1:mBtHxQRTrzQB0G5oap7IcgP9Ny5p9BJSGhWnuQ+35EY= -github.com/aws/aws-sdk-go-v2/service/amplify v1.22.0 h1:PN8oZ7yRpzFAyx9iSX1xlwtxsWaIVvncW4iYisqGaDA= -github.com/aws/aws-sdk-go-v2/service/amplify v1.22.0/go.mod h1:eB7zMwDOZm527WOxYKa7VyHLp8dcVEUD9JpCczepKhs= +github.com/aws/aws-sdk-go-v2/service/amplify v1.22.1 h1:4ViQJ+tm0D5a+aAdJlPsw+tsxAxbN/ChdbyCWtVRnPg= +github.com/aws/aws-sdk-go-v2/service/amplify v1.22.1/go.mod h1:IlSHwknO6vYVWAMPddUNS+RIJEFDawvLl9NMmMoXBgU= github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.0 h1:Cos+utTtPG8mSuYTEyetXJdYsRzSqN09Z4Kv/rDgf2E= github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.0/go.mod h1:s7TCkwGkWXJCMGM1bxTU5v+mmtgfoPWE+hs8I9Qzhlo= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.0 h1:xyP23z+l970ebhCqrNbayxqN0w5ispKvdnaOeaXMNZ0= From 5d0e56fbbf136a5b59eafd15825654f2bf5a5104 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:14 -0400 Subject: [PATCH 030/208] go get github.com/aws/aws-sdk-go-v2/service/apigateway. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 36d54e66850..1e54cdbe560 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.1 github.com/aws/aws-sdk-go-v2/service/amp v1.26.1 github.com/aws/aws-sdk-go-v2/service/amplify v1.22.1 - github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.0 + github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.0 github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.0 github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.0 diff --git a/go.sum b/go.sum index 69ad66e96a1..d3b0138a3db 100644 --- a/go.sum +++ b/go.sum @@ -56,8 +56,8 @@ github.com/aws/aws-sdk-go-v2/service/amp v1.26.1 h1:svGkgUKZDc5SNSiP6BgcOe/6sPmw github.com/aws/aws-sdk-go-v2/service/amp v1.26.1/go.mod h1:mBtHxQRTrzQB0G5oap7IcgP9Ny5p9BJSGhWnuQ+35EY= github.com/aws/aws-sdk-go-v2/service/amplify v1.22.1 h1:4ViQJ+tm0D5a+aAdJlPsw+tsxAxbN/ChdbyCWtVRnPg= github.com/aws/aws-sdk-go-v2/service/amplify v1.22.1/go.mod h1:IlSHwknO6vYVWAMPddUNS+RIJEFDawvLl9NMmMoXBgU= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.0 h1:Cos+utTtPG8mSuYTEyetXJdYsRzSqN09Z4Kv/rDgf2E= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.0/go.mod h1:s7TCkwGkWXJCMGM1bxTU5v+mmtgfoPWE+hs8I9Qzhlo= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1 h1:20jy3+l7bQA6tJ1nJxg8+l+1Xm9KrDslNVvc8HvLoEI= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1/go.mod h1:gcUX4UmbhON3+0ij28aojD7vaMPqsRYFefqwxCLbUnw= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.0 h1:xyP23z+l970ebhCqrNbayxqN0w5ispKvdnaOeaXMNZ0= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.0/go.mod h1:mU2L10FRxydiAqsbOzaVq70Y5MHQohDwDyFw4Fu2GIs= github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.0 h1:pQWQjXVrVyIXk2aWCxjhCiUmM+zIMfZdiyrtm9GAEC8= From 648d5c975729997a236b792c05bcc3d87c8b17b2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:15 -0400 Subject: [PATCH 031/208] go get github.com/aws/aws-sdk-go-v2/service/apigatewayv2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1e54cdbe560..707cc5428ce 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/amp v1.26.1 github.com/aws/aws-sdk-go-v2/service/amplify v1.22.1 github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1 - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.0 + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1 github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.0 github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.0 github.com/aws/aws-sdk-go-v2/service/appflow v1.42.0 diff --git a/go.sum b/go.sum index d3b0138a3db..8a248b7878e 100644 --- a/go.sum +++ b/go.sum @@ -58,8 +58,8 @@ github.com/aws/aws-sdk-go-v2/service/amplify v1.22.1 h1:4ViQJ+tm0D5a+aAdJlPsw+ts github.com/aws/aws-sdk-go-v2/service/amplify v1.22.1/go.mod h1:IlSHwknO6vYVWAMPddUNS+RIJEFDawvLl9NMmMoXBgU= github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1 h1:20jy3+l7bQA6tJ1nJxg8+l+1Xm9KrDslNVvc8HvLoEI= github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1/go.mod h1:gcUX4UmbhON3+0ij28aojD7vaMPqsRYFefqwxCLbUnw= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.0 h1:xyP23z+l970ebhCqrNbayxqN0w5ispKvdnaOeaXMNZ0= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.0/go.mod h1:mU2L10FRxydiAqsbOzaVq70Y5MHQohDwDyFw4Fu2GIs= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1 h1:qbbxz47vQdGzvLeHS8xmvp3shV0n8cAnmred+Ehj6qQ= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1/go.mod h1:3tgssMs7RA6rZoI6K9w6Nc6gCmhadTFAOU+OXh4tPkQ= github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.0 h1:pQWQjXVrVyIXk2aWCxjhCiUmM+zIMfZdiyrtm9GAEC8= github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.0/go.mod h1:IjrKbSqKQ0srC0s9LMN4KxRSmxv0xlePl/ORBtpMhWk= github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.0 h1:FTpvnBAfIHc/sXTS+QiGgTRercCD/yIzs7jm1YmJw9I= From 389afb0713ca848ffe2acdab58877ab39238052d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:16 -0400 Subject: [PATCH 032/208] go get github.com/aws/aws-sdk-go-v2/service/appconfig. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 707cc5428ce..31e0533ad39 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/amplify v1.22.1 github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1 - github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.0 + github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.1 github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.0 github.com/aws/aws-sdk-go-v2/service/appflow v1.42.0 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.0 diff --git a/go.sum b/go.sum index 8a248b7878e..54053f14552 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,8 @@ github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1 h1:20jy3+l7bQA6tJ1nJxg8+ github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1/go.mod h1:gcUX4UmbhON3+0ij28aojD7vaMPqsRYFefqwxCLbUnw= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1 h1:qbbxz47vQdGzvLeHS8xmvp3shV0n8cAnmred+Ehj6qQ= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1/go.mod h1:3tgssMs7RA6rZoI6K9w6Nc6gCmhadTFAOU+OXh4tPkQ= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.0 h1:pQWQjXVrVyIXk2aWCxjhCiUmM+zIMfZdiyrtm9GAEC8= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.0/go.mod h1:IjrKbSqKQ0srC0s9LMN4KxRSmxv0xlePl/ORBtpMhWk= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.1 h1:h2JzyyqbvuXD2I0HombM5CsbmFbB3jcVeF/WhX8AjCk= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.1/go.mod h1:rOJ1yTzhpIWjgop8XniA+nanxF4jpyUnLcX1s0gaShg= github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.0 h1:FTpvnBAfIHc/sXTS+QiGgTRercCD/yIzs7jm1YmJw9I= github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.0/go.mod h1:UeUkeICXydru3Efh6fktw5FiEs1hqg6TgvHw1ygJmak= github.com/aws/aws-sdk-go-v2/service/appflow v1.42.0 h1:ey8eexxAmSeyC1Vu50DuMEoKzKePmbi9EHEJEeo/mW4= From bddeeb889c066bc94fa0d873457c3cb86857444b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:16 -0400 Subject: [PATCH 033/208] go get github.com/aws/aws-sdk-go-v2/service/appfabric. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 31e0533ad39..f84d2d12159 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1 github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.1 - github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.0 + github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.1 github.com/aws/aws-sdk-go-v2/service/appflow v1.42.0 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.0 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.0 diff --git a/go.sum b/go.sum index 54053f14552..3c4c94a2155 100644 --- a/go.sum +++ b/go.sum @@ -62,8 +62,8 @@ github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1 h1:qbbxz47vQdGzvLeHS8x github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1/go.mod h1:3tgssMs7RA6rZoI6K9w6Nc6gCmhadTFAOU+OXh4tPkQ= github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.1 h1:h2JzyyqbvuXD2I0HombM5CsbmFbB3jcVeF/WhX8AjCk= github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.1/go.mod h1:rOJ1yTzhpIWjgop8XniA+nanxF4jpyUnLcX1s0gaShg= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.0 h1:FTpvnBAfIHc/sXTS+QiGgTRercCD/yIzs7jm1YmJw9I= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.0/go.mod h1:UeUkeICXydru3Efh6fktw5FiEs1hqg6TgvHw1ygJmak= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.1 h1:TbZ4cm8Mvw+auu0xQk7m6iFg9p+uFC97cUzYKZObt/s= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.1/go.mod h1:9QTxY84kkzjBDUHp8mErDspSgpA6e8A/1AvU2AvYJ7I= github.com/aws/aws-sdk-go-v2/service/appflow v1.42.0 h1:ey8eexxAmSeyC1Vu50DuMEoKzKePmbi9EHEJEeo/mW4= github.com/aws/aws-sdk-go-v2/service/appflow v1.42.0/go.mod h1:T6e7RTxTAfm31RqbHJJRJs9aY9HJW5fEEmSMTeskI0k= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.0 h1:kLUWmnf29cThAQm7No0flo3BL4Rfk2sN+ip9eezjkSY= From dad742b41c98a980c17203e66baaa83c636979c8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:17 -0400 Subject: [PATCH 034/208] go get github.com/aws/aws-sdk-go-v2/service/appflow. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f84d2d12159..4aa3e8dd798 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1 github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.1 github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.1 - github.com/aws/aws-sdk-go-v2/service/appflow v1.42.0 + github.com/aws/aws-sdk-go-v2/service/appflow v1.42.1 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.0 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.0 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.0 diff --git a/go.sum b/go.sum index 3c4c94a2155..083cca8b462 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.1 h1:h2JzyyqbvuXD2I0HombM5C github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.1/go.mod h1:rOJ1yTzhpIWjgop8XniA+nanxF4jpyUnLcX1s0gaShg= github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.1 h1:TbZ4cm8Mvw+auu0xQk7m6iFg9p+uFC97cUzYKZObt/s= github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.1/go.mod h1:9QTxY84kkzjBDUHp8mErDspSgpA6e8A/1AvU2AvYJ7I= -github.com/aws/aws-sdk-go-v2/service/appflow v1.42.0 h1:ey8eexxAmSeyC1Vu50DuMEoKzKePmbi9EHEJEeo/mW4= -github.com/aws/aws-sdk-go-v2/service/appflow v1.42.0/go.mod h1:T6e7RTxTAfm31RqbHJJRJs9aY9HJW5fEEmSMTeskI0k= +github.com/aws/aws-sdk-go-v2/service/appflow v1.42.1 h1:zxPjTkoh8wIgVg/R7NCG9t5X7UhZjAf+RrL49J9uv3g= +github.com/aws/aws-sdk-go-v2/service/appflow v1.42.1/go.mod h1:rsZVlJIXpHihdPFV4ehYl9nO3VJ61ido6ccJGXVFTYQ= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.0 h1:kLUWmnf29cThAQm7No0flo3BL4Rfk2sN+ip9eezjkSY= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.0/go.mod h1:FEhHqncLj7R+PU9QhAPDgMzwAsHGIXZ98rCedWwSfTY= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.0 h1:4WPtF/0EXZIca7qCh+FUJX3Y/8cQ74/e/OHPCGER3l8= From 08c2da35df494ca6107bd300266d5a9f164c156e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:18 -0400 Subject: [PATCH 035/208] go get github.com/aws/aws-sdk-go-v2/service/appintegrations. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4aa3e8dd798..59a74943431 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.1 github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.1 github.com/aws/aws-sdk-go-v2/service/appflow v1.42.1 - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.0 + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.1 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.0 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.0 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.0 diff --git a/go.sum b/go.sum index 083cca8b462..80a847dab99 100644 --- a/go.sum +++ b/go.sum @@ -66,8 +66,8 @@ github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.1 h1:TbZ4cm8Mvw+auu0xQk7m6iF github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.1/go.mod h1:9QTxY84kkzjBDUHp8mErDspSgpA6e8A/1AvU2AvYJ7I= github.com/aws/aws-sdk-go-v2/service/appflow v1.42.1 h1:zxPjTkoh8wIgVg/R7NCG9t5X7UhZjAf+RrL49J9uv3g= github.com/aws/aws-sdk-go-v2/service/appflow v1.42.1/go.mod h1:rsZVlJIXpHihdPFV4ehYl9nO3VJ61ido6ccJGXVFTYQ= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.0 h1:kLUWmnf29cThAQm7No0flo3BL4Rfk2sN+ip9eezjkSY= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.0/go.mod h1:FEhHqncLj7R+PU9QhAPDgMzwAsHGIXZ98rCedWwSfTY= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.1 h1:ubkE7GDCrVnbeQXCSYdKd+yLdyPlnNowDgWKifhNItQ= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.1/go.mod h1:TewkvUJ7j870qbp0WQu+JcGEprz+ts5eSw/2qabcIqg= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.0 h1:4WPtF/0EXZIca7qCh+FUJX3Y/8cQ74/e/OHPCGER3l8= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.0/go.mod h1:asZnTFVkzwvpaXxDG/A8GX8hHBHKlP9SxK+S4YTzWIs= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.0 h1:Ia8i2uaLSv4Tf4q/hpbX29RQFTTD5Y6xXoysx8kP6Sc= From 5874cc45395e25498bb1711920a33b77edbba559 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:19 -0400 Subject: [PATCH 036/208] go get github.com/aws/aws-sdk-go-v2/service/applicationautoscaling. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 59a74943431..88ccb24f798 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.1 github.com/aws/aws-sdk-go-v2/service/appflow v1.42.1 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.1 - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.0 + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.1 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.0 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.0 github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.0 diff --git a/go.sum b/go.sum index 80a847dab99..d07b5d71346 100644 --- a/go.sum +++ b/go.sum @@ -68,8 +68,8 @@ github.com/aws/aws-sdk-go-v2/service/appflow v1.42.1 h1:zxPjTkoh8wIgVg/R7NCG9t5X github.com/aws/aws-sdk-go-v2/service/appflow v1.42.1/go.mod h1:rsZVlJIXpHihdPFV4ehYl9nO3VJ61ido6ccJGXVFTYQ= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.1 h1:ubkE7GDCrVnbeQXCSYdKd+yLdyPlnNowDgWKifhNItQ= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.1/go.mod h1:TewkvUJ7j870qbp0WQu+JcGEprz+ts5eSw/2qabcIqg= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.0 h1:4WPtF/0EXZIca7qCh+FUJX3Y/8cQ74/e/OHPCGER3l8= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.0/go.mod h1:asZnTFVkzwvpaXxDG/A8GX8hHBHKlP9SxK+S4YTzWIs= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.1 h1:ANEJvQOBqUqBkacz03QaTZoievYqZ6BGSFsTfS6LEEQ= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.1/go.mod h1:yS6PzOMIdA8mF/UCbekP9fRHwd9AdZpBuTfBShvOgG4= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.0 h1:Ia8i2uaLSv4Tf4q/hpbX29RQFTTD5Y6xXoysx8kP6Sc= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.0/go.mod h1:ISL5+44fOp3YrbemFOPOQY6vMHwrpGIv2DUG3Y3ONXE= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.0 h1:vljpVeJryJTc7jf2mS2STCcQaAW6LQF3x5GWrmntbys= From 981f349f9d8ed10dcc7f05dd3b8acd4af4e1dac3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:19 -0400 Subject: [PATCH 037/208] go get github.com/aws/aws-sdk-go-v2/service/applicationinsights. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 88ccb24f798..5528683bd12 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appflow v1.42.1 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.1 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.1 - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.0 + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.1 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.0 github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.0 github.com/aws/aws-sdk-go-v2/service/appstream v1.35.0 diff --git a/go.sum b/go.sum index d07b5d71346..ca41d1069dc 100644 --- a/go.sum +++ b/go.sum @@ -70,8 +70,8 @@ github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.1 h1:ubkE7GDCrVnbeQXC github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.1/go.mod h1:TewkvUJ7j870qbp0WQu+JcGEprz+ts5eSw/2qabcIqg= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.1 h1:ANEJvQOBqUqBkacz03QaTZoievYqZ6BGSFsTfS6LEEQ= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.1/go.mod h1:yS6PzOMIdA8mF/UCbekP9fRHwd9AdZpBuTfBShvOgG4= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.0 h1:Ia8i2uaLSv4Tf4q/hpbX29RQFTTD5Y6xXoysx8kP6Sc= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.0/go.mod h1:ISL5+44fOp3YrbemFOPOQY6vMHwrpGIv2DUG3Y3ONXE= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.1 h1:TtRLnoTa+KzpQTtfxIUNmTPd4afNXpTMenzkkna8Xhk= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.1/go.mod h1:KNQm1mLx1brArm7jx7ssJ1xTczUkVj/PsDEJUfam1Q4= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.0 h1:vljpVeJryJTc7jf2mS2STCcQaAW6LQF3x5GWrmntbys= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.0/go.mod h1:zuRwtacIdGnoc0eEcpuG0VOhSsCG94/e4VBqT1KVJLI= github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.0 h1:2mq4wcqtUnXRWiET9g9fb4BCM58u4k7cV40aKNFKMlY= From f48877a4aa2a8ca2d4e1b79e35c1d3eba1553dd5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:20 -0400 Subject: [PATCH 038/208] go get github.com/aws/aws-sdk-go-v2/service/applicationsignals. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5528683bd12..d8580a7d335 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.1 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.1 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.1 - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.0 + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.1 github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.0 github.com/aws/aws-sdk-go-v2/service/appstream v1.35.0 github.com/aws/aws-sdk-go-v2/service/appsync v1.33.0 diff --git a/go.sum b/go.sum index ca41d1069dc..846fbcd7064 100644 --- a/go.sum +++ b/go.sum @@ -72,8 +72,8 @@ github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.1 h1:ANEJvQOBq github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.1/go.mod h1:yS6PzOMIdA8mF/UCbekP9fRHwd9AdZpBuTfBShvOgG4= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.1 h1:TtRLnoTa+KzpQTtfxIUNmTPd4afNXpTMenzkkna8Xhk= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.1/go.mod h1:KNQm1mLx1brArm7jx7ssJ1xTczUkVj/PsDEJUfam1Q4= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.0 h1:vljpVeJryJTc7jf2mS2STCcQaAW6LQF3x5GWrmntbys= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.0/go.mod h1:zuRwtacIdGnoc0eEcpuG0VOhSsCG94/e4VBqT1KVJLI= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.1 h1:4f1B5azmuPT6Q5wWxjf5U0TJzAH3st8wP5gfxz8l49M= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.1/go.mod h1:ihPVq+A4BcK86La1KEUY8mM0k0egpal2f8SMhBeLIIY= github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.0 h1:2mq4wcqtUnXRWiET9g9fb4BCM58u4k7cV40aKNFKMlY= github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.0/go.mod h1:8rZ+Aao3XWYvbqtYCK3VjTnZvBe3DcT7KoVZxjSMg+k= github.com/aws/aws-sdk-go-v2/service/appstream v1.35.0 h1:9L19kRzVtNUIiz0NQnvgJypzplJPG9JOEjBy/wyuN3E= From a816d802ea51125632bb543e060ebd9d275afb30 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:21 -0400 Subject: [PATCH 039/208] go get github.com/aws/aws-sdk-go-v2/service/apprunner. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d8580a7d335..cee0e5641dd 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.1 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.1 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.1 - github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.0 + github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.1 github.com/aws/aws-sdk-go-v2/service/appstream v1.35.0 github.com/aws/aws-sdk-go-v2/service/appsync v1.33.0 github.com/aws/aws-sdk-go-v2/service/athena v1.42.0 diff --git a/go.sum b/go.sum index 846fbcd7064..c6f78595eb8 100644 --- a/go.sum +++ b/go.sum @@ -74,8 +74,8 @@ github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.1 h1:TtRLnoTa+Kzp github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.1/go.mod h1:KNQm1mLx1brArm7jx7ssJ1xTczUkVj/PsDEJUfam1Q4= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.1 h1:4f1B5azmuPT6Q5wWxjf5U0TJzAH3st8wP5gfxz8l49M= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.1/go.mod h1:ihPVq+A4BcK86La1KEUY8mM0k0egpal2f8SMhBeLIIY= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.0 h1:2mq4wcqtUnXRWiET9g9fb4BCM58u4k7cV40aKNFKMlY= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.0/go.mod h1:8rZ+Aao3XWYvbqtYCK3VjTnZvBe3DcT7KoVZxjSMg+k= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.1 h1:ZI0Je1AGcU4AM3xMsMsA4xgrKzNgFSkQR/w6Ihi+rZA= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.1/go.mod h1:RWEXpKx8evWnba3DAfAupnzlM2ejdWNBOII/udFrJlg= github.com/aws/aws-sdk-go-v2/service/appstream v1.35.0 h1:9L19kRzVtNUIiz0NQnvgJypzplJPG9JOEjBy/wyuN3E= github.com/aws/aws-sdk-go-v2/service/appstream v1.35.0/go.mod h1:ATnlc2aY3z5XskWJEWKTza4/wpVPrOwFtJ9HI8Buv+c= github.com/aws/aws-sdk-go-v2/service/appsync v1.33.0 h1:x1hy4koCboAVbQ45Nn2LaMKa/bBaRpp4vXOUfmfgfm4= From cd9164d38645df85575d3cd606373709f2863120 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:22 -0400 Subject: [PATCH 040/208] go get github.com/aws/aws-sdk-go-v2/service/appstream. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cee0e5641dd..83787f7a5a1 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.1 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.1 github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.1 - github.com/aws/aws-sdk-go-v2/service/appstream v1.35.0 + github.com/aws/aws-sdk-go-v2/service/appstream v1.35.1 github.com/aws/aws-sdk-go-v2/service/appsync v1.33.0 github.com/aws/aws-sdk-go-v2/service/athena v1.42.0 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.0 diff --git a/go.sum b/go.sum index c6f78595eb8..5e7765edc10 100644 --- a/go.sum +++ b/go.sum @@ -76,8 +76,8 @@ github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.1 h1:4f1B5azmuPT6Q5 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.1/go.mod h1:ihPVq+A4BcK86La1KEUY8mM0k0egpal2f8SMhBeLIIY= github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.1 h1:ZI0Je1AGcU4AM3xMsMsA4xgrKzNgFSkQR/w6Ihi+rZA= github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.1/go.mod h1:RWEXpKx8evWnba3DAfAupnzlM2ejdWNBOII/udFrJlg= -github.com/aws/aws-sdk-go-v2/service/appstream v1.35.0 h1:9L19kRzVtNUIiz0NQnvgJypzplJPG9JOEjBy/wyuN3E= -github.com/aws/aws-sdk-go-v2/service/appstream v1.35.0/go.mod h1:ATnlc2aY3z5XskWJEWKTza4/wpVPrOwFtJ9HI8Buv+c= +github.com/aws/aws-sdk-go-v2/service/appstream v1.35.1 h1:wlll0kVBQVfZB2oNqDG1CooV5xRezoYPQ0vUvxnf8g0= +github.com/aws/aws-sdk-go-v2/service/appstream v1.35.1/go.mod h1:qLT0nQAYhXj8LLa7fmLvx8nYTRIQ5y+CH06QfU/CPic= github.com/aws/aws-sdk-go-v2/service/appsync v1.33.0 h1:x1hy4koCboAVbQ45Nn2LaMKa/bBaRpp4vXOUfmfgfm4= github.com/aws/aws-sdk-go-v2/service/appsync v1.33.0/go.mod h1:W7hltBv7yaHsWPmuCHZC8Zs2AxANqfXQC/S6EXV074s= github.com/aws/aws-sdk-go-v2/service/athena v1.42.0 h1:Sr0bdGcjjjdbKnfbG3E9/yFA3NjfdqjMNfdYeWbeI84= From 787dd590dc8d6774e55d2a043972b02e13903289 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:23 -0400 Subject: [PATCH 041/208] go get github.com/aws/aws-sdk-go-v2/service/appsync. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 83787f7a5a1..ebe4d5afb91 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.1 github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.1 github.com/aws/aws-sdk-go-v2/service/appstream v1.35.1 - github.com/aws/aws-sdk-go-v2/service/appsync v1.33.0 + github.com/aws/aws-sdk-go-v2/service/appsync v1.33.1 github.com/aws/aws-sdk-go-v2/service/athena v1.42.0 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.0 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.0 diff --git a/go.sum b/go.sum index 5e7765edc10..9ed73414149 100644 --- a/go.sum +++ b/go.sum @@ -78,8 +78,8 @@ github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.1 h1:ZI0Je1AGcU4AM3xMsMsA4x github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.1/go.mod h1:RWEXpKx8evWnba3DAfAupnzlM2ejdWNBOII/udFrJlg= github.com/aws/aws-sdk-go-v2/service/appstream v1.35.1 h1:wlll0kVBQVfZB2oNqDG1CooV5xRezoYPQ0vUvxnf8g0= github.com/aws/aws-sdk-go-v2/service/appstream v1.35.1/go.mod h1:qLT0nQAYhXj8LLa7fmLvx8nYTRIQ5y+CH06QfU/CPic= -github.com/aws/aws-sdk-go-v2/service/appsync v1.33.0 h1:x1hy4koCboAVbQ45Nn2LaMKa/bBaRpp4vXOUfmfgfm4= -github.com/aws/aws-sdk-go-v2/service/appsync v1.33.0/go.mod h1:W7hltBv7yaHsWPmuCHZC8Zs2AxANqfXQC/S6EXV074s= +github.com/aws/aws-sdk-go-v2/service/appsync v1.33.1 h1:zbMPXMPrM9hYWySGW6xm2AA4GtBmhqU+rYxit+8vJis= +github.com/aws/aws-sdk-go-v2/service/appsync v1.33.1/go.mod h1:t1V04AJ0mgXsmSkac1UpykISXNIEr6Gkgx8JgYpEKpk= github.com/aws/aws-sdk-go-v2/service/athena v1.42.0 h1:Sr0bdGcjjjdbKnfbG3E9/yFA3NjfdqjMNfdYeWbeI84= github.com/aws/aws-sdk-go-v2/service/athena v1.42.0/go.mod h1:icVkUXsjL0BclkZQGcj8HhOHhV8VXLHp+eRy0GPlT+I= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.0 h1:81lVxLdg3myFI+42mmuzde474/7ITz3Dr14h2XgH928= From 1cb5b313db2d2e3465c5d50a84f2939b2c850a61 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:24 -0400 Subject: [PATCH 042/208] go get github.com/aws/aws-sdk-go-v2/service/athena. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ebe4d5afb91..d6dac5e111e 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.1 github.com/aws/aws-sdk-go-v2/service/appstream v1.35.1 github.com/aws/aws-sdk-go-v2/service/appsync v1.33.1 - github.com/aws/aws-sdk-go-v2/service/athena v1.42.0 + github.com/aws/aws-sdk-go-v2/service/athena v1.43.0 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.0 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.0 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.0 diff --git a/go.sum b/go.sum index 9ed73414149..eba0e17e4f2 100644 --- a/go.sum +++ b/go.sum @@ -80,8 +80,8 @@ github.com/aws/aws-sdk-go-v2/service/appstream v1.35.1 h1:wlll0kVBQVfZB2oNqDG1Co github.com/aws/aws-sdk-go-v2/service/appstream v1.35.1/go.mod h1:qLT0nQAYhXj8LLa7fmLvx8nYTRIQ5y+CH06QfU/CPic= github.com/aws/aws-sdk-go-v2/service/appsync v1.33.1 h1:zbMPXMPrM9hYWySGW6xm2AA4GtBmhqU+rYxit+8vJis= github.com/aws/aws-sdk-go-v2/service/appsync v1.33.1/go.mod h1:t1V04AJ0mgXsmSkac1UpykISXNIEr6Gkgx8JgYpEKpk= -github.com/aws/aws-sdk-go-v2/service/athena v1.42.0 h1:Sr0bdGcjjjdbKnfbG3E9/yFA3NjfdqjMNfdYeWbeI84= -github.com/aws/aws-sdk-go-v2/service/athena v1.42.0/go.mod h1:icVkUXsjL0BclkZQGcj8HhOHhV8VXLHp+eRy0GPlT+I= +github.com/aws/aws-sdk-go-v2/service/athena v1.43.0 h1:9gG6ddaduB/vNXa62sI5BSXXZ6ohbN6zYrowdKeOLxU= +github.com/aws/aws-sdk-go-v2/service/athena v1.43.0/go.mod h1:IgZ3BPAIcafbIEndBsCEZSo559W16aD6m6sRcGO97gM= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.0 h1:81lVxLdg3myFI+42mmuzde474/7ITz3Dr14h2XgH928= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.0/go.mod h1:GEg56OI9X8fYbWmcN713VVeY6fKcgK5TRnZDSy5T2fg= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.0 h1:TwUcxCwi9aILTyZ/Ua4Hxd6jmvzQHVyngMvoN35PPts= From 5274f380b3ccf1094e02d4cf0b90da985cacd8d7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:24 -0400 Subject: [PATCH 043/208] go get github.com/aws/aws-sdk-go-v2/service/auditmanager. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d6dac5e111e..1b89767682d 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appstream v1.35.1 github.com/aws/aws-sdk-go-v2/service/appsync v1.33.1 github.com/aws/aws-sdk-go-v2/service/athena v1.43.0 - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.0 + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.1 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.0 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.0 github.com/aws/aws-sdk-go-v2/service/backup v1.35.0 diff --git a/go.sum b/go.sum index eba0e17e4f2..54275bd9ab5 100644 --- a/go.sum +++ b/go.sum @@ -82,8 +82,8 @@ github.com/aws/aws-sdk-go-v2/service/appsync v1.33.1 h1:zbMPXMPrM9hYWySGW6xm2AA4 github.com/aws/aws-sdk-go-v2/service/appsync v1.33.1/go.mod h1:t1V04AJ0mgXsmSkac1UpykISXNIEr6Gkgx8JgYpEKpk= github.com/aws/aws-sdk-go-v2/service/athena v1.43.0 h1:9gG6ddaduB/vNXa62sI5BSXXZ6ohbN6zYrowdKeOLxU= github.com/aws/aws-sdk-go-v2/service/athena v1.43.0/go.mod h1:IgZ3BPAIcafbIEndBsCEZSo559W16aD6m6sRcGO97gM= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.0 h1:81lVxLdg3myFI+42mmuzde474/7ITz3Dr14h2XgH928= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.0/go.mod h1:GEg56OI9X8fYbWmcN713VVeY6fKcgK5TRnZDSy5T2fg= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.1 h1:0vWu89NdYkrqiXodXViT9UxT5WO70ZsZ4gQme7UQzaY= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.1/go.mod h1:9AVNQ9gOvNkX8AzDT2lXI1iZkL5vqbgv+zcNRYL4bVI= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.0 h1:TwUcxCwi9aILTyZ/Ua4Hxd6jmvzQHVyngMvoN35PPts= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.0/go.mod h1:7o4x9MEil/+SnU9vtXrLMLrEOrrR+jZxm4SsRQKXayo= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.0 h1:thL+4Wxgd+D4VWr9/BWFHVvaDWezaBC7ciRklNMkvgk= From 424ce10f78c2e9f4c10b582fd0b4e1fc5329899e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:25 -0400 Subject: [PATCH 044/208] go get github.com/aws/aws-sdk-go-v2/service/autoscaling. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1b89767682d..2ccf8af701a 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appsync v1.33.1 github.com/aws/aws-sdk-go-v2/service/athena v1.43.0 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.1 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.0 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.0 github.com/aws/aws-sdk-go-v2/service/backup v1.35.0 github.com/aws/aws-sdk-go-v2/service/batch v1.40.0 diff --git a/go.sum b/go.sum index 54275bd9ab5..6ea025bda49 100644 --- a/go.sum +++ b/go.sum @@ -84,8 +84,8 @@ github.com/aws/aws-sdk-go-v2/service/athena v1.43.0 h1:9gG6ddaduB/vNXa62sI5BSXXZ github.com/aws/aws-sdk-go-v2/service/athena v1.43.0/go.mod h1:IgZ3BPAIcafbIEndBsCEZSo559W16aD6m6sRcGO97gM= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.1 h1:0vWu89NdYkrqiXodXViT9UxT5WO70ZsZ4gQme7UQzaY= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.1/go.mod h1:9AVNQ9gOvNkX8AzDT2lXI1iZkL5vqbgv+zcNRYL4bVI= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.0 h1:TwUcxCwi9aILTyZ/Ua4Hxd6jmvzQHVyngMvoN35PPts= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.0/go.mod h1:7o4x9MEil/+SnU9vtXrLMLrEOrrR+jZxm4SsRQKXayo= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1 h1:ZNokD9M3On22Qscssyi3iQAzkoeOJxnE5NANNCzPzIA= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1/go.mod h1:5XY8CFGBv6dZp/thbk8FRIAWjqNckM7PsL848KHdzjI= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.0 h1:thL+4Wxgd+D4VWr9/BWFHVvaDWezaBC7ciRklNMkvgk= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.0/go.mod h1:xBZfNNPlWOEfS9s6uh8DFk/qeRrEFWxUdersMay5Tt4= github.com/aws/aws-sdk-go-v2/service/backup v1.35.0 h1:Rslqrh+EzDX0dZIfgCZ61TEoN0wuksFmvS+MyO3LKvI= From 2f5c15377fdd6e294ad8e9c541ca4e0d6cae3684 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:26 -0400 Subject: [PATCH 045/208] go get github.com/aws/aws-sdk-go-v2/service/autoscalingplans. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2ccf8af701a..e4d0ac73822 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/athena v1.43.0 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.1 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1 - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.0 + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.1 github.com/aws/aws-sdk-go-v2/service/backup v1.35.0 github.com/aws/aws-sdk-go-v2/service/batch v1.40.0 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.0 diff --git a/go.sum b/go.sum index 6ea025bda49..5c83b007b01 100644 --- a/go.sum +++ b/go.sum @@ -86,8 +86,8 @@ github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.1 h1:0vWu89NdYkrqiXodXVi github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.1/go.mod h1:9AVNQ9gOvNkX8AzDT2lXI1iZkL5vqbgv+zcNRYL4bVI= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1 h1:ZNokD9M3On22Qscssyi3iQAzkoeOJxnE5NANNCzPzIA= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1/go.mod h1:5XY8CFGBv6dZp/thbk8FRIAWjqNckM7PsL848KHdzjI= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.0 h1:thL+4Wxgd+D4VWr9/BWFHVvaDWezaBC7ciRklNMkvgk= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.0/go.mod h1:xBZfNNPlWOEfS9s6uh8DFk/qeRrEFWxUdersMay5Tt4= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.1 h1:YHR0n0eUY964ffHangUAvM/vjJUYoj1058G4/xoZG+c= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.1/go.mod h1:BltrhZlEEwdnaSFsqZUiZA7tJk4Ie9JQ2P1r1qCpsIs= github.com/aws/aws-sdk-go-v2/service/backup v1.35.0 h1:Rslqrh+EzDX0dZIfgCZ61TEoN0wuksFmvS+MyO3LKvI= github.com/aws/aws-sdk-go-v2/service/backup v1.35.0/go.mod h1:eNW1wQTY8Fy+Sl0meiqzuE0IKKbN3vBN6H8st2K8msU= github.com/aws/aws-sdk-go-v2/service/batch v1.40.0 h1:jel/D32IZ/GID2mCCWOcvS5q9j+rzbR8flyOmgus5wI= From 4f5b92f4eaed1954956ba532d7c7ed18a6faa20e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:27 -0400 Subject: [PATCH 046/208] go get github.com/aws/aws-sdk-go-v2/service/backup. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e4d0ac73822..25a334a623d 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.1 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.1 - github.com/aws/aws-sdk-go-v2/service/backup v1.35.0 + github.com/aws/aws-sdk-go-v2/service/backup v1.35.1 github.com/aws/aws-sdk-go-v2/service/batch v1.40.0 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.0 github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.0 diff --git a/go.sum b/go.sum index 5c83b007b01..5dfa2efda1f 100644 --- a/go.sum +++ b/go.sum @@ -88,8 +88,8 @@ github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1 h1:ZNokD9M3On22Qscssyi3 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1/go.mod h1:5XY8CFGBv6dZp/thbk8FRIAWjqNckM7PsL848KHdzjI= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.1 h1:YHR0n0eUY964ffHangUAvM/vjJUYoj1058G4/xoZG+c= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.1/go.mod h1:BltrhZlEEwdnaSFsqZUiZA7tJk4Ie9JQ2P1r1qCpsIs= -github.com/aws/aws-sdk-go-v2/service/backup v1.35.0 h1:Rslqrh+EzDX0dZIfgCZ61TEoN0wuksFmvS+MyO3LKvI= -github.com/aws/aws-sdk-go-v2/service/backup v1.35.0/go.mod h1:eNW1wQTY8Fy+Sl0meiqzuE0IKKbN3vBN6H8st2K8msU= +github.com/aws/aws-sdk-go-v2/service/backup v1.35.1 h1:JDoVIgC8dzbc1GBH1rYQYcovRh92RDIrywal3fZrQlA= +github.com/aws/aws-sdk-go-v2/service/backup v1.35.1/go.mod h1:443Jou0o4i+ea/y6mOvo8zgIkvXDJ3pdCWjZ/YFfk5Q= github.com/aws/aws-sdk-go-v2/service/batch v1.40.0 h1:jel/D32IZ/GID2mCCWOcvS5q9j+rzbR8flyOmgus5wI= github.com/aws/aws-sdk-go-v2/service/batch v1.40.0/go.mod h1:Q4rnVSoW0d1+ayvXY9yyAtVCHYz8yXBys2PJmPFQeCA= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.0 h1:zJt5mo1zyx1l2lVU4HOTKYXWH/cw0Xc33rZtmg/TRoU= From f125a1d1faa0aafa7701a8a65d2295f4b6249a10 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:28 -0400 Subject: [PATCH 047/208] go get github.com/aws/aws-sdk-go-v2/service/batch. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 25a334a623d..96011a1be79 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.1 github.com/aws/aws-sdk-go-v2/service/backup v1.35.1 - github.com/aws/aws-sdk-go-v2/service/batch v1.40.0 + github.com/aws/aws-sdk-go-v2/service/batch v1.40.1 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.0 github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.0 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.0 diff --git a/go.sum b/go.sum index 5dfa2efda1f..a6376e65f7a 100644 --- a/go.sum +++ b/go.sum @@ -90,8 +90,8 @@ github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.1 h1:YHR0n0eUY964ffH github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.1/go.mod h1:BltrhZlEEwdnaSFsqZUiZA7tJk4Ie9JQ2P1r1qCpsIs= github.com/aws/aws-sdk-go-v2/service/backup v1.35.1 h1:JDoVIgC8dzbc1GBH1rYQYcovRh92RDIrywal3fZrQlA= github.com/aws/aws-sdk-go-v2/service/backup v1.35.1/go.mod h1:443Jou0o4i+ea/y6mOvo8zgIkvXDJ3pdCWjZ/YFfk5Q= -github.com/aws/aws-sdk-go-v2/service/batch v1.40.0 h1:jel/D32IZ/GID2mCCWOcvS5q9j+rzbR8flyOmgus5wI= -github.com/aws/aws-sdk-go-v2/service/batch v1.40.0/go.mod h1:Q4rnVSoW0d1+ayvXY9yyAtVCHYz8yXBys2PJmPFQeCA= +github.com/aws/aws-sdk-go-v2/service/batch v1.40.1 h1:khjAF2CScjXDGdCKZqkB6W95os0Ro+b/CFHT5nGQ+nU= +github.com/aws/aws-sdk-go-v2/service/batch v1.40.1/go.mod h1:9B+DcqWg4/hcorXHhkK/ZT68/LgEcWwlvlWXD0XAGoU= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.0 h1:zJt5mo1zyx1l2lVU4HOTKYXWH/cw0Xc33rZtmg/TRoU= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.0/go.mod h1:sSLqjK2+Wg8fqOso0TNnHnD0IMaDwOWhJALolz84MDI= github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.0 h1:wZRiGdDO5M5YgFtHlO0GkRND03oBOr44K2qdMry3biM= From 6deb5587a8d642dc0d637229ce09db40ff531ffe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:29 -0400 Subject: [PATCH 048/208] go get github.com/aws/aws-sdk-go-v2/service/bcmdataexports. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 96011a1be79..3d66ab05082 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.1 github.com/aws/aws-sdk-go-v2/service/backup v1.35.1 github.com/aws/aws-sdk-go-v2/service/batch v1.40.1 - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.0 + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.1 github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.0 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.0 github.com/aws/aws-sdk-go-v2/service/budgets v1.24.0 diff --git a/go.sum b/go.sum index a6376e65f7a..5dbce097e1a 100644 --- a/go.sum +++ b/go.sum @@ -92,8 +92,8 @@ github.com/aws/aws-sdk-go-v2/service/backup v1.35.1 h1:JDoVIgC8dzbc1GBH1rYQYcovR github.com/aws/aws-sdk-go-v2/service/backup v1.35.1/go.mod h1:443Jou0o4i+ea/y6mOvo8zgIkvXDJ3pdCWjZ/YFfk5Q= github.com/aws/aws-sdk-go-v2/service/batch v1.40.1 h1:khjAF2CScjXDGdCKZqkB6W95os0Ro+b/CFHT5nGQ+nU= github.com/aws/aws-sdk-go-v2/service/batch v1.40.1/go.mod h1:9B+DcqWg4/hcorXHhkK/ZT68/LgEcWwlvlWXD0XAGoU= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.0 h1:zJt5mo1zyx1l2lVU4HOTKYXWH/cw0Xc33rZtmg/TRoU= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.0/go.mod h1:sSLqjK2+Wg8fqOso0TNnHnD0IMaDwOWhJALolz84MDI= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.1 h1:UieVxA3h0rBI3DisJ1dFhRlR4lReFx8QkMPD6lIB6d0= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.1/go.mod h1:4Zm38MntGZFvQR6CPPC21lI1TvT94ZVEdEi4xBRnHZQ= github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.0 h1:wZRiGdDO5M5YgFtHlO0GkRND03oBOr44K2qdMry3biM= github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.0/go.mod h1:9RHg4c320Tf1hxX1IIyJ1siGS2ry+B+7SqBkoybQ/2U= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.0 h1:pr+lctXgiRFMhm8M1+woYe6AEGHf6PHT0y6QwQDCyw4= From 054d8a58975c6692bad90bab35a6eee7c70820ea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:30 -0400 Subject: [PATCH 049/208] go get github.com/aws/aws-sdk-go-v2/service/bedrock. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3d66ab05082..d377a1cbc8e 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/backup v1.35.1 github.com/aws/aws-sdk-go-v2/service/batch v1.40.1 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.1 - github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.0 + github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.1 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.0 github.com/aws/aws-sdk-go-v2/service/budgets v1.24.0 github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.0 diff --git a/go.sum b/go.sum index 5dbce097e1a..25e09b6d26d 100644 --- a/go.sum +++ b/go.sum @@ -94,8 +94,8 @@ github.com/aws/aws-sdk-go-v2/service/batch v1.40.1 h1:khjAF2CScjXDGdCKZqkB6W95os github.com/aws/aws-sdk-go-v2/service/batch v1.40.1/go.mod h1:9B+DcqWg4/hcorXHhkK/ZT68/LgEcWwlvlWXD0XAGoU= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.1 h1:UieVxA3h0rBI3DisJ1dFhRlR4lReFx8QkMPD6lIB6d0= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.1/go.mod h1:4Zm38MntGZFvQR6CPPC21lI1TvT94ZVEdEi4xBRnHZQ= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.0 h1:wZRiGdDO5M5YgFtHlO0GkRND03oBOr44K2qdMry3biM= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.0/go.mod h1:9RHg4c320Tf1hxX1IIyJ1siGS2ry+B+7SqBkoybQ/2U= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.1 h1:e2FZRSG0h0nA/sdRJJXtOnbMXPvAFUoyRNWG3oTioyc= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.1/go.mod h1:4e+Wd418o5s7L7NChi9vWNjMkJtm/yi6NmWy5efcACk= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.0 h1:pr+lctXgiRFMhm8M1+woYe6AEGHf6PHT0y6QwQDCyw4= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.0/go.mod h1:vorT3phLE0Jez8CRI60hVQCdDjzPxXohhErZOqz/uHI= github.com/aws/aws-sdk-go-v2/service/budgets v1.24.0 h1:K+zmh8LUtZCnGGTf7mbdpgp12Rb+ZNm485tu1XxzwZ0= From 158ff3e29c0f41154567ca9baa4bbc30e824d604 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:30 -0400 Subject: [PATCH 050/208] go get github.com/aws/aws-sdk-go-v2/service/bedrockagent. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d377a1cbc8e..1eaa8c54545 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/batch v1.40.1 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.1 github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.1 - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.0 + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.1 github.com/aws/aws-sdk-go-v2/service/budgets v1.24.0 github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.0 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.0 diff --git a/go.sum b/go.sum index 25e09b6d26d..c6f3de7b072 100644 --- a/go.sum +++ b/go.sum @@ -96,8 +96,8 @@ github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.1 h1:UieVxA3h0rBI3DisJ1 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.1/go.mod h1:4Zm38MntGZFvQR6CPPC21lI1TvT94ZVEdEi4xBRnHZQ= github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.1 h1:e2FZRSG0h0nA/sdRJJXtOnbMXPvAFUoyRNWG3oTioyc= github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.1/go.mod h1:4e+Wd418o5s7L7NChi9vWNjMkJtm/yi6NmWy5efcACk= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.0 h1:pr+lctXgiRFMhm8M1+woYe6AEGHf6PHT0y6QwQDCyw4= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.0/go.mod h1:vorT3phLE0Jez8CRI60hVQCdDjzPxXohhErZOqz/uHI= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.1 h1:DD/97H5KizWQP3Dj051VHjObCpWtAThIjMjoz71kn0w= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.1/go.mod h1:IFBd2ljkmZvNdvCS/0IDWQ1/zSkebKueBo7+IZLre54= github.com/aws/aws-sdk-go-v2/service/budgets v1.24.0 h1:K+zmh8LUtZCnGGTf7mbdpgp12Rb+ZNm485tu1XxzwZ0= github.com/aws/aws-sdk-go-v2/service/budgets v1.24.0/go.mod h1:TtEJrSZX2gBPB0KhgTo0OfmvpXObcOeHW/UE/6C2Kew= github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.0 h1:z/npc7c0BgFzQXSVLw9FZFm2GAVO/B9luB/1lgUqZIY= From c7fc8c6a869514b87d3beab00c8b2d89f28bcc89 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:31 -0400 Subject: [PATCH 051/208] go get github.com/aws/aws-sdk-go-v2/service/budgets. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1eaa8c54545..e6590dec473 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.1 github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.1 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.1 - github.com/aws/aws-sdk-go-v2/service/budgets v1.24.0 + github.com/aws/aws-sdk-go-v2/service/budgets v1.24.1 github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.0 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.0 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.0 diff --git a/go.sum b/go.sum index c6f3de7b072..98bc02c90ad 100644 --- a/go.sum +++ b/go.sum @@ -98,8 +98,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.1 h1:e2FZRSG0h0nA/sdRJJXtOnbMX github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.1/go.mod h1:4e+Wd418o5s7L7NChi9vWNjMkJtm/yi6NmWy5efcACk= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.1 h1:DD/97H5KizWQP3Dj051VHjObCpWtAThIjMjoz71kn0w= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.1/go.mod h1:IFBd2ljkmZvNdvCS/0IDWQ1/zSkebKueBo7+IZLre54= -github.com/aws/aws-sdk-go-v2/service/budgets v1.24.0 h1:K+zmh8LUtZCnGGTf7mbdpgp12Rb+ZNm485tu1XxzwZ0= -github.com/aws/aws-sdk-go-v2/service/budgets v1.24.0/go.mod h1:TtEJrSZX2gBPB0KhgTo0OfmvpXObcOeHW/UE/6C2Kew= +github.com/aws/aws-sdk-go-v2/service/budgets v1.24.1 h1:idyO38YS22rDYGpk/1vusjuHyTt3TepwjLPAhlzeBJU= +github.com/aws/aws-sdk-go-v2/service/budgets v1.24.1/go.mod h1:9WRJ9/p51FEA92MA9pMZkDN2h5YBHcVU/hFqq8E/2c0= github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.0 h1:z/npc7c0BgFzQXSVLw9FZFm2GAVO/B9luB/1lgUqZIY= github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.0/go.mod h1:P7199G/FaCnRmyNJKhre84iGg8D0a5rIh8SksFcCs+A= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.0 h1:ESa6Z9SbR2b8dsMo6G8JIAt6wHgPV22LC/2M/ZAqMkk= From 0e0e1a3e2810440786ff93a02a60b28a0abb7c86 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:32 -0400 Subject: [PATCH 052/208] go get github.com/aws/aws-sdk-go-v2/service/chatbot. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e6590dec473..e5218781350 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.1 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.1 github.com/aws/aws-sdk-go-v2/service/budgets v1.24.1 - github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.0 + github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.1 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.0 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.0 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.0 diff --git a/go.sum b/go.sum index 98bc02c90ad..8d0e6ce6012 100644 --- a/go.sum +++ b/go.sum @@ -100,8 +100,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.1 h1:DD/97H5KizWQP3Dj051 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.1/go.mod h1:IFBd2ljkmZvNdvCS/0IDWQ1/zSkebKueBo7+IZLre54= github.com/aws/aws-sdk-go-v2/service/budgets v1.24.1 h1:idyO38YS22rDYGpk/1vusjuHyTt3TepwjLPAhlzeBJU= github.com/aws/aws-sdk-go-v2/service/budgets v1.24.1/go.mod h1:9WRJ9/p51FEA92MA9pMZkDN2h5YBHcVU/hFqq8E/2c0= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.0 h1:z/npc7c0BgFzQXSVLw9FZFm2GAVO/B9luB/1lgUqZIY= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.0/go.mod h1:P7199G/FaCnRmyNJKhre84iGg8D0a5rIh8SksFcCs+A= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.1 h1:WlvYO/q57AA6zvtFKiQAtsWqCHeG1d9wlhDGUU9f7tw= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.1/go.mod h1:/h+o63KFyzK+/JkYgChKyjVJHgC61vQUDixoXedtRd8= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.0 h1:ESa6Z9SbR2b8dsMo6G8JIAt6wHgPV22LC/2M/ZAqMkk= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.0/go.mod h1:G4GvQuBcVMBqWh+CN6uPsqHRvssUyzsbj0IQGjapUFo= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.0 h1:tfLMmT43ctr13Bn67fTnVfz3gDbtei4tdJapNTeg2WQ= From 02aff98d554c67d6db7b3c0aca3292260b909f04 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:33 -0400 Subject: [PATCH 053/208] go get github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e5218781350..f164289c185 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.1 github.com/aws/aws-sdk-go-v2/service/budgets v1.24.1 github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.1 - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.0 + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.1 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.0 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.0 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.0 diff --git a/go.sum b/go.sum index 8d0e6ce6012..c474c362750 100644 --- a/go.sum +++ b/go.sum @@ -102,8 +102,8 @@ github.com/aws/aws-sdk-go-v2/service/budgets v1.24.1 h1:idyO38YS22rDYGpk/1vusjuH github.com/aws/aws-sdk-go-v2/service/budgets v1.24.1/go.mod h1:9WRJ9/p51FEA92MA9pMZkDN2h5YBHcVU/hFqq8E/2c0= github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.1 h1:WlvYO/q57AA6zvtFKiQAtsWqCHeG1d9wlhDGUU9f7tw= github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.1/go.mod h1:/h+o63KFyzK+/JkYgChKyjVJHgC61vQUDixoXedtRd8= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.0 h1:ESa6Z9SbR2b8dsMo6G8JIAt6wHgPV22LC/2M/ZAqMkk= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.0/go.mod h1:G4GvQuBcVMBqWh+CN6uPsqHRvssUyzsbj0IQGjapUFo= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.1 h1:/ig2xIYS5wtZtNQm2JvcJEk2MHf9Np09nM7Qo81xMAw= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.1/go.mod h1:K7Zis8oztyCOfruXbrO07OFAdciHATEpuQJ6flJPgyQ= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.0 h1:tfLMmT43ctr13Bn67fTnVfz3gDbtei4tdJapNTeg2WQ= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.0/go.mod h1:BC8CIP0PsZAhUDixYPaZFx8VoeHrpLk5GrxXQfYa4CA= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.0 h1:QebHv7d+bOVJBy4W7GimKQEcOGbKDGdel1ZarIEUbVw= From 5f4c1230fb50cb035324bc48c3b0150f860e0dba Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:34 -0400 Subject: [PATCH 054/208] go get github.com/aws/aws-sdk-go-v2/service/chimesdkvoice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f164289c185..632356cf9da 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/budgets v1.24.1 github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.1 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.1 - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.0 + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.1 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.0 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.0 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.0 diff --git a/go.sum b/go.sum index c474c362750..0e416f94208 100644 --- a/go.sum +++ b/go.sum @@ -104,8 +104,8 @@ github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.1 h1:WlvYO/q57AA6zvtFKiQAtsWqC github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.1/go.mod h1:/h+o63KFyzK+/JkYgChKyjVJHgC61vQUDixoXedtRd8= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.1 h1:/ig2xIYS5wtZtNQm2JvcJEk2MHf9Np09nM7Qo81xMAw= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.1/go.mod h1:K7Zis8oztyCOfruXbrO07OFAdciHATEpuQJ6flJPgyQ= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.0 h1:tfLMmT43ctr13Bn67fTnVfz3gDbtei4tdJapNTeg2WQ= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.0/go.mod h1:BC8CIP0PsZAhUDixYPaZFx8VoeHrpLk5GrxXQfYa4CA= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.1 h1:03VekFsZgpSMWICYT8j/pdOxSBQjN1IYmRWuZeYMiFI= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.1/go.mod h1:Cj5LyJm1YKQZcJ7ZL82TEF6KZnjvnCt4Tv+DAl7otHM= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.0 h1:QebHv7d+bOVJBy4W7GimKQEcOGbKDGdel1ZarIEUbVw= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.0/go.mod h1:aDektKdR9DtsOVmx2qZES53exu/JieOEE+RY02edx1E= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.0 h1:32mBVHktTOMYts6uLhRcmQKKObM5mCW45u/eVSawkis= From 9b0f5693aecd017a80fffc69ed72e522353b23c7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:35 -0400 Subject: [PATCH 055/208] go get github.com/aws/aws-sdk-go-v2/service/cleanrooms. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 632356cf9da..639247cc3ae 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.1 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.1 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.1 - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.0 + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.1 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.0 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.0 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.0 diff --git a/go.sum b/go.sum index 0e416f94208..269a5a11b25 100644 --- a/go.sum +++ b/go.sum @@ -106,8 +106,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.1 h1:/ig2xIYS5 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.1/go.mod h1:K7Zis8oztyCOfruXbrO07OFAdciHATEpuQJ6flJPgyQ= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.1 h1:03VekFsZgpSMWICYT8j/pdOxSBQjN1IYmRWuZeYMiFI= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.1/go.mod h1:Cj5LyJm1YKQZcJ7ZL82TEF6KZnjvnCt4Tv+DAl7otHM= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.0 h1:QebHv7d+bOVJBy4W7GimKQEcOGbKDGdel1ZarIEUbVw= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.0/go.mod h1:aDektKdR9DtsOVmx2qZES53exu/JieOEE+RY02edx1E= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.1 h1:WRpeBgByda+zUWmca7DKsI42exYNYqoLjKtn9HC82Ug= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.1/go.mod h1:cPdw/jsG/67Lcgfqy/LJ/FzguR0HUbxEKBQDixh0LHc= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.0 h1:32mBVHktTOMYts6uLhRcmQKKObM5mCW45u/eVSawkis= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.0/go.mod h1:nI/COcoOpplZFJfSSkr9HkhwE0Zuq+Ar677fvfEyn0U= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.0 h1:TzWMznMQZ8NIfIpp7+QdqanvNMh/rYen3M/cvm13NO4= From f144ca837164d7a01a58332d9150b1bb01ca8056 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:36 -0400 Subject: [PATCH 056/208] go get github.com/aws/aws-sdk-go-v2/service/cloud9. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 639247cc3ae..11a5d28e875 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.1 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.1 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.1 - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.0 + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.1 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.0 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.0 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.0 diff --git a/go.sum b/go.sum index 269a5a11b25..b446237409e 100644 --- a/go.sum +++ b/go.sum @@ -108,8 +108,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.1 h1:03VekFsZgpSMWICYT8 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.1/go.mod h1:Cj5LyJm1YKQZcJ7ZL82TEF6KZnjvnCt4Tv+DAl7otHM= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.1 h1:WRpeBgByda+zUWmca7DKsI42exYNYqoLjKtn9HC82Ug= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.1/go.mod h1:cPdw/jsG/67Lcgfqy/LJ/FzguR0HUbxEKBQDixh0LHc= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.0 h1:32mBVHktTOMYts6uLhRcmQKKObM5mCW45u/eVSawkis= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.0/go.mod h1:nI/COcoOpplZFJfSSkr9HkhwE0Zuq+Ar677fvfEyn0U= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.1 h1:mKH2nvCvTExFQCEWOjXfMtuF7y6bAwwx33JF2GpzsLk= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.1/go.mod h1:v2nyYCd5sx1XwKx/1wUuEGa97kbdrqfGXTlmg/w6lyg= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.0 h1:TzWMznMQZ8NIfIpp7+QdqanvNMh/rYen3M/cvm13NO4= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.0/go.mod h1:jM1vnDSlhghsGirQ3nAwPVN+VBJs5f0ndAAqMEVshQU= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.0 h1:o4KYr8Mz5/6270WLfIq7Bg+s8BDzlqBeyoUR8WsNaJM= From 5af35a94a04de74a4f5b99d655a988b8c01f576d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:36 -0400 Subject: [PATCH 057/208] go get github.com/aws/aws-sdk-go-v2/service/cloudcontrol. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 11a5d28e875..7fc51a9ce33 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.1 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.1 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.1 - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.0 + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.1 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.0 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.0 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.0 diff --git a/go.sum b/go.sum index b446237409e..0aa9236d589 100644 --- a/go.sum +++ b/go.sum @@ -110,8 +110,8 @@ github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.1 h1:WRpeBgByda+zUWmca7DKs github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.1/go.mod h1:cPdw/jsG/67Lcgfqy/LJ/FzguR0HUbxEKBQDixh0LHc= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.1 h1:mKH2nvCvTExFQCEWOjXfMtuF7y6bAwwx33JF2GpzsLk= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.1/go.mod h1:v2nyYCd5sx1XwKx/1wUuEGa97kbdrqfGXTlmg/w6lyg= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.0 h1:TzWMznMQZ8NIfIpp7+QdqanvNMh/rYen3M/cvm13NO4= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.0/go.mod h1:jM1vnDSlhghsGirQ3nAwPVN+VBJs5f0ndAAqMEVshQU= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.1 h1:xje03QCAf/8b1Ntsx/QR4oTn0tMIshVT/OUAilcwcO0= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.1/go.mod h1:4hiczFeqZEQy8yX5/uY1rgXKnOXam6GAoWZrFEfoyMY= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.0 h1:o4KYr8Mz5/6270WLfIq7Bg+s8BDzlqBeyoUR8WsNaJM= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.0/go.mod h1:mTlG5ftvrnlCepKl3O6LMvbj3BUSbpKIXoIFkKiC6gQ= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.0 h1:e94R6zDJ4r3VPvtnJERAGR6G1dpcA2P8gjMkvpV7KaY= From 6a46e559b1200c730331c541817bbb03dcfc6bb9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:37 -0400 Subject: [PATCH 058/208] go get github.com/aws/aws-sdk-go-v2/service/cloudformation. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7fc51a9ce33..72220c65e00 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.1 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.1 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.1 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.0 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.0 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.0 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.0 diff --git a/go.sum b/go.sum index 0aa9236d589..49ff441f451 100644 --- a/go.sum +++ b/go.sum @@ -112,8 +112,8 @@ github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.1 h1:mKH2nvCvTExFQCEWOjXfMtuF7 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.1/go.mod h1:v2nyYCd5sx1XwKx/1wUuEGa97kbdrqfGXTlmg/w6lyg= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.1 h1:xje03QCAf/8b1Ntsx/QR4oTn0tMIshVT/OUAilcwcO0= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.1/go.mod h1:4hiczFeqZEQy8yX5/uY1rgXKnOXam6GAoWZrFEfoyMY= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.0 h1:o4KYr8Mz5/6270WLfIq7Bg+s8BDzlqBeyoUR8WsNaJM= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.0/go.mod h1:mTlG5ftvrnlCepKl3O6LMvbj3BUSbpKIXoIFkKiC6gQ= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1 h1:Ts+mCjOtt8o2k2vnWnX/0sE0eSmEVWBvfJkNrNMQlAo= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1/go.mod h1:IrWhabzdTEc651GAq7rgst/SYcEqqcD7Avr82m28AAU= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.0 h1:e94R6zDJ4r3VPvtnJERAGR6G1dpcA2P8gjMkvpV7KaY= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.0/go.mod h1:I2pHP163WgKrZYYUHB0TYqy0CTLaTXXPOjhBcN909og= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.0 h1:CxSxQho9OyQauJgWoy2ceyicHyf9m2+bZuSbcV8q9EI= From 14c37889bb8c8f35b4533dace828b3c2905f1914 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:38 -0400 Subject: [PATCH 059/208] go get github.com/aws/aws-sdk-go-v2/service/cloudfront. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 72220c65e00..cfc1abaed8b 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.1 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.1 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1 - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.0 + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.1 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.0 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.0 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.0 diff --git a/go.sum b/go.sum index 49ff441f451..120255a6463 100644 --- a/go.sum +++ b/go.sum @@ -114,8 +114,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.1 h1:xje03QCAf/8b1Ntsx/Q github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.1/go.mod h1:4hiczFeqZEQy8yX5/uY1rgXKnOXam6GAoWZrFEfoyMY= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1 h1:Ts+mCjOtt8o2k2vnWnX/0sE0eSmEVWBvfJkNrNMQlAo= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1/go.mod h1:IrWhabzdTEc651GAq7rgst/SYcEqqcD7Avr82m28AAU= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.0 h1:e94R6zDJ4r3VPvtnJERAGR6G1dpcA2P8gjMkvpV7KaY= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.0/go.mod h1:I2pHP163WgKrZYYUHB0TYqy0CTLaTXXPOjhBcN909og= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.1 h1:oOm9MhuUpAWAmjcXwkTsYBzXzFIDbVYje6P5jPkG3kU= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.1/go.mod h1:Pri+xMTktTIOpTg/yYeCYgk4vOrv6sZLcB467ePRIoU= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.0 h1:CxSxQho9OyQauJgWoy2ceyicHyf9m2+bZuSbcV8q9EI= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.0/go.mod h1:js3OHqsvjHfBGiR3cKxje/bu9CIbZ6kODi0AfRKoC2k= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.0 h1:jmiHtI0dyjUmlTieA5wHr5CD0OjFj5X48yqkFQT58Tc= From 01019d6e8544c0a63e918b7d975835efcebd08f3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:40 -0400 Subject: [PATCH 060/208] go get github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cfc1abaed8b..d606c2b83e4 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.1 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.1 - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.0 + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.1 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.0 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.0 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.0 diff --git a/go.sum b/go.sum index 120255a6463..77482a7f8ac 100644 --- a/go.sum +++ b/go.sum @@ -116,8 +116,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1 h1:Ts+mCjOtt8o2k2vnW github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1/go.mod h1:IrWhabzdTEc651GAq7rgst/SYcEqqcD7Avr82m28AAU= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.1 h1:oOm9MhuUpAWAmjcXwkTsYBzXzFIDbVYje6P5jPkG3kU= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.1/go.mod h1:Pri+xMTktTIOpTg/yYeCYgk4vOrv6sZLcB467ePRIoU= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.0 h1:CxSxQho9OyQauJgWoy2ceyicHyf9m2+bZuSbcV8q9EI= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.0/go.mod h1:js3OHqsvjHfBGiR3cKxje/bu9CIbZ6kODi0AfRKoC2k= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.1 h1:kMR6y3b2eXF9NzHqGlH3cDxC2S6KfuBXJb5+m++KWLo= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.1/go.mod h1:aXg8JNvonDQbjiNPMSZ5G5/VEH1ZJSsM8u2tFKn1dbk= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.0 h1:jmiHtI0dyjUmlTieA5wHr5CD0OjFj5X48yqkFQT58Tc= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.0/go.mod h1:OnOsdWLQoghWto7y/M5yCvSuxI7zLyjbUBQE5R+D9P0= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.0 h1:EvxViEG4aJ75SYrbHy1AdNrxkOKF1Pu/gbbCo2uPB+w= From ba00283c212912755e55efcb4679c4ccb51698dc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:40 -0400 Subject: [PATCH 061/208] go get github.com/aws/aws-sdk-go-v2/service/cloudhsmv2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d606c2b83e4..608f829a06a 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.1 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.1 - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.0 + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.1 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.0 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.0 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.0 diff --git a/go.sum b/go.sum index 77482a7f8ac..b2618339587 100644 --- a/go.sum +++ b/go.sum @@ -118,8 +118,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.1 h1:oOm9MhuUpAWAmjcXwkTsY github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.1/go.mod h1:Pri+xMTktTIOpTg/yYeCYgk4vOrv6sZLcB467ePRIoU= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.1 h1:kMR6y3b2eXF9NzHqGlH3cDxC2S6KfuBXJb5+m++KWLo= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.1/go.mod h1:aXg8JNvonDQbjiNPMSZ5G5/VEH1ZJSsM8u2tFKn1dbk= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.0 h1:jmiHtI0dyjUmlTieA5wHr5CD0OjFj5X48yqkFQT58Tc= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.0/go.mod h1:OnOsdWLQoghWto7y/M5yCvSuxI7zLyjbUBQE5R+D9P0= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.1 h1:SmnVTefyghNfnuGXMnJsHEYn2S90RCpUlOKf0e2YnMI= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.1/go.mod h1:iqbEItGSpoAow7uFw27QZ6qylNKKa94QP8UK6tjzSq4= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.0 h1:EvxViEG4aJ75SYrbHy1AdNrxkOKF1Pu/gbbCo2uPB+w= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.0/go.mod h1:VfcR30AxMSIuSqrYLb8n3N2YitWfSqrmLiX0Cat0xnY= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.0 h1:SLgkiFKAfLqUJyDIZeNhfqExA3xVNP5zRzZqIKMTFzo= From 6626eff9758f0fc5590dece55532b48cb1579caf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:42 -0400 Subject: [PATCH 062/208] go get github.com/aws/aws-sdk-go-v2/service/cloudsearch. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 608f829a06a..91b4ebd332e 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.1 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.1 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.1 - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.0 + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.1 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.0 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.0 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.0 diff --git a/go.sum b/go.sum index b2618339587..9af9ae0dabf 100644 --- a/go.sum +++ b/go.sum @@ -120,8 +120,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.1 h1:kMR6y3b2e github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.1/go.mod h1:aXg8JNvonDQbjiNPMSZ5G5/VEH1ZJSsM8u2tFKn1dbk= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.1 h1:SmnVTefyghNfnuGXMnJsHEYn2S90RCpUlOKf0e2YnMI= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.1/go.mod h1:iqbEItGSpoAow7uFw27QZ6qylNKKa94QP8UK6tjzSq4= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.0 h1:EvxViEG4aJ75SYrbHy1AdNrxkOKF1Pu/gbbCo2uPB+w= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.0/go.mod h1:VfcR30AxMSIuSqrYLb8n3N2YitWfSqrmLiX0Cat0xnY= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.1 h1:fTsQs8LBzM87p5KJdJAfF43VMMWFPFcD9HuX//D6kQ4= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.1/go.mod h1:C0foT3p9IlsG0bMtL0457lvntFeu6Qgt9VumKlI7zkg= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.0 h1:SLgkiFKAfLqUJyDIZeNhfqExA3xVNP5zRzZqIKMTFzo= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.0/go.mod h1:ZoPhg3Mqkoqi5Z3+h8ArMfns6QxH1UgPLsi2WvDx9KQ= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.0 h1:mPSDewf6WAU9Csb5UvJbQjdTrh1YRqIXz8qSI7ZjFvQ= From 708e96e989c2ed2f1057d23369cfa7fa6be67d45 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:42 -0400 Subject: [PATCH 063/208] go get github.com/aws/aws-sdk-go-v2/service/cloudtrail. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 91b4ebd332e..657aa70a4bb 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.1 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.1 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.1 - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.0 + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.1 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.0 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.0 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.0 diff --git a/go.sum b/go.sum index 9af9ae0dabf..cef69200ac3 100644 --- a/go.sum +++ b/go.sum @@ -122,8 +122,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.1 h1:SmnVTefyghNfnuGXMnJsH github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.1/go.mod h1:iqbEItGSpoAow7uFw27QZ6qylNKKa94QP8UK6tjzSq4= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.1 h1:fTsQs8LBzM87p5KJdJAfF43VMMWFPFcD9HuX//D6kQ4= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.1/go.mod h1:C0foT3p9IlsG0bMtL0457lvntFeu6Qgt9VumKlI7zkg= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.0 h1:SLgkiFKAfLqUJyDIZeNhfqExA3xVNP5zRzZqIKMTFzo= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.0/go.mod h1:ZoPhg3Mqkoqi5Z3+h8ArMfns6QxH1UgPLsi2WvDx9KQ= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.1 h1:dSDDTrkL0JUsAtLxE4MXeUlDHuSrYz+S2h/5/j2AHDQ= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.1/go.mod h1:t612HtnZuwt6UkB/JMxewOHaeRI5VklfVj6UcwOwfCk= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.0 h1:mPSDewf6WAU9Csb5UvJbQjdTrh1YRqIXz8qSI7ZjFvQ= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.0/go.mod h1:DI/WW2qdeZn0yFmzR/JZqxCEI/kPPV7CMj5+j6IEsyo= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.0 h1:lFn5aoo8DlyBWy2FynTLPSlfdjdyPN/y9LYb7uojWXE= From 20995bb19c7e2d964346cc168ebd97e6a27cb71b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:43 -0400 Subject: [PATCH 064/208] go get github.com/aws/aws-sdk-go-v2/service/cloudwatch. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 657aa70a4bb..56decd739d2 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.1 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.1 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.1 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.0 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.0 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.0 github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.0 diff --git a/go.sum b/go.sum index cef69200ac3..4a3472f659e 100644 --- a/go.sum +++ b/go.sum @@ -124,8 +124,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.1 h1:fTsQs8LBzM87p5KJdJAf github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.1/go.mod h1:C0foT3p9IlsG0bMtL0457lvntFeu6Qgt9VumKlI7zkg= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.1 h1:dSDDTrkL0JUsAtLxE4MXeUlDHuSrYz+S2h/5/j2AHDQ= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.1/go.mod h1:t612HtnZuwt6UkB/JMxewOHaeRI5VklfVj6UcwOwfCk= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.0 h1:mPSDewf6WAU9Csb5UvJbQjdTrh1YRqIXz8qSI7ZjFvQ= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.0/go.mod h1:DI/WW2qdeZn0yFmzR/JZqxCEI/kPPV7CMj5+j6IEsyo= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1 h1:U2qFeD0atfYsNMX7pVPvTG+vI7jCoelcWomOK7F8b34= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1/go.mod h1:6cstKfQIguQDuWrHKYhjod025+J7n0AR+azv5t9HYBY= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.0 h1:lFn5aoo8DlyBWy2FynTLPSlfdjdyPN/y9LYb7uojWXE= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.0/go.mod h1:eFPFaDAUICetgvWBzn0jH6D5zu6/+/CbtuqlaGFSMrQ= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.0 h1:3jegt/XwhjmG+lweNnn6o+3GUWohGDB03JT5Qyhjy6w= From 9707c82a71eb279a6203278a80476c35272a51cd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:44 -0400 Subject: [PATCH 065/208] go get github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 56decd739d2..346a96ceb48 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.1 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.1 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.0 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.1 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.0 github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.0 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.0 diff --git a/go.sum b/go.sum index 4a3472f659e..cbfb7ae0848 100644 --- a/go.sum +++ b/go.sum @@ -126,8 +126,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.1 h1:dSDDTrkL0JUsAtLxE4MXe github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.1/go.mod h1:t612HtnZuwt6UkB/JMxewOHaeRI5VklfVj6UcwOwfCk= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1 h1:U2qFeD0atfYsNMX7pVPvTG+vI7jCoelcWomOK7F8b34= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1/go.mod h1:6cstKfQIguQDuWrHKYhjod025+J7n0AR+azv5t9HYBY= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.0 h1:lFn5aoo8DlyBWy2FynTLPSlfdjdyPN/y9LYb7uojWXE= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.0/go.mod h1:eFPFaDAUICetgvWBzn0jH6D5zu6/+/CbtuqlaGFSMrQ= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.1 h1:9S1OsS3TCTUwBcK6K6EUYKyEb7sc3lNvf4KJY9WrMfQ= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.1/go.mod h1:u4Wxjs4U9OLN1HDFLAFTnS0mDC8kh23RCV8ctQSxpT0= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.0 h1:3jegt/XwhjmG+lweNnn6o+3GUWohGDB03JT5Qyhjy6w= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.0/go.mod h1:5pydPuwwmrII/A6KAwA+CzmTOegfqI4etP2efFxdVBg= github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.0 h1:z7A3wnYlRMPAaL/3rgOhfunZNgCkxYxWeX+IrBLNdEI= From 349b6b16702843e1b61d360348bc26a628342315 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:45 -0400 Subject: [PATCH 066/208] go get github.com/aws/aws-sdk-go-v2/service/codeartifact. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 346a96ceb48..c5c9a5d44ba 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.1 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.1 - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.0 + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.1 github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.0 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.0 github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.0 diff --git a/go.sum b/go.sum index cbfb7ae0848..207f1d659db 100644 --- a/go.sum +++ b/go.sum @@ -128,8 +128,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1 h1:U2qFeD0atfYsNMX7pVPvT github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1/go.mod h1:6cstKfQIguQDuWrHKYhjod025+J7n0AR+azv5t9HYBY= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.1 h1:9S1OsS3TCTUwBcK6K6EUYKyEb7sc3lNvf4KJY9WrMfQ= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.1/go.mod h1:u4Wxjs4U9OLN1HDFLAFTnS0mDC8kh23RCV8ctQSxpT0= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.0 h1:3jegt/XwhjmG+lweNnn6o+3GUWohGDB03JT5Qyhjy6w= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.0/go.mod h1:5pydPuwwmrII/A6KAwA+CzmTOegfqI4etP2efFxdVBg= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.1 h1:1OfXVziIGFVm5FHvDkWogdHUkXlZZwqe/0LCbxnmfYA= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.1/go.mod h1:XKoFW8gDY8bULuq8+sKHrMqsbnVi9MTkeJmf69ZxoLk= github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.0 h1:z7A3wnYlRMPAaL/3rgOhfunZNgCkxYxWeX+IrBLNdEI= github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.0/go.mod h1:60OtE7cK691Mwi3yzgjMsK0p/fox2f2ABxb9I8tfRqs= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.0 h1:xyMh2lYk7iXCbrdkmErQiXCrIR09gSMS5ywYhBRPNmg= From ec348ca177822deefd10dd04f6db0c288f8e4915 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:45 -0400 Subject: [PATCH 067/208] go get github.com/aws/aws-sdk-go-v2/service/codebuild. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c5c9a5d44ba..a1d1c5516aa 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.1 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.1 - github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.0 + github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.1 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.0 github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.0 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.0 diff --git a/go.sum b/go.sum index 207f1d659db..3e5b95436c7 100644 --- a/go.sum +++ b/go.sum @@ -130,8 +130,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.1 h1:9S1OsS3TCTUwBcK6K github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.1/go.mod h1:u4Wxjs4U9OLN1HDFLAFTnS0mDC8kh23RCV8ctQSxpT0= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.1 h1:1OfXVziIGFVm5FHvDkWogdHUkXlZZwqe/0LCbxnmfYA= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.1/go.mod h1:XKoFW8gDY8bULuq8+sKHrMqsbnVi9MTkeJmf69ZxoLk= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.0 h1:z7A3wnYlRMPAaL/3rgOhfunZNgCkxYxWeX+IrBLNdEI= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.0/go.mod h1:60OtE7cK691Mwi3yzgjMsK0p/fox2f2ABxb9I8tfRqs= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.1 h1:bnzjHm+ogGF+ldBxE/QX4LS8EdmvVmo2crELrUH8Vko= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.1/go.mod h1:8M+F8tdWjmhBbEBrYZNEIqyaewVROyMpGbjAE0ezzaE= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.0 h1:xyMh2lYk7iXCbrdkmErQiXCrIR09gSMS5ywYhBRPNmg= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.0/go.mod h1:jjBzkVPPhrZuyXg/Fzxz8YxBjCw1kTVoB2kH3cSYIts= github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.0 h1:tVN59Z3FGpGh4DMv/qrgsjplKXdm5NrHKpIVvvTgwxo= From 9ef75cbcd7e37c1cd0895da1893434f4bbe69e49 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:46 -0400 Subject: [PATCH 068/208] go get github.com/aws/aws-sdk-go-v2/service/codecatalyst. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a1d1c5516aa..cf88caabc9c 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.1 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.1 github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.1 - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.0 + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.1 github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.0 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.0 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.0 diff --git a/go.sum b/go.sum index 3e5b95436c7..85dc5cd911f 100644 --- a/go.sum +++ b/go.sum @@ -132,8 +132,8 @@ github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.1 h1:1OfXVziIGFVm5FHvDkW github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.1/go.mod h1:XKoFW8gDY8bULuq8+sKHrMqsbnVi9MTkeJmf69ZxoLk= github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.1 h1:bnzjHm+ogGF+ldBxE/QX4LS8EdmvVmo2crELrUH8Vko= github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.1/go.mod h1:8M+F8tdWjmhBbEBrYZNEIqyaewVROyMpGbjAE0ezzaE= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.0 h1:xyMh2lYk7iXCbrdkmErQiXCrIR09gSMS5ywYhBRPNmg= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.0/go.mod h1:jjBzkVPPhrZuyXg/Fzxz8YxBjCw1kTVoB2kH3cSYIts= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.1 h1:/VqrREr150QUHg2sT3HyXruh75wgxNF/ovXJrNirwHo= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.1/go.mod h1:ssdLO5gMVtYjJywV9Qif/BMcJIF7TMrygQzP0FjZsJg= github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.0 h1:tVN59Z3FGpGh4DMv/qrgsjplKXdm5NrHKpIVvvTgwxo= github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.0/go.mod h1:9wxPodN0jhDQk1X/hiWrvQSCgIzuwTc+5zY/tLStRJM= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.0 h1:+GRYZ5t75fFMudQOW+IGH6zxaEy8NQQtt+oK9m8JbJY= From dc53bfbbddc433fdae691d9c2e56c9622876a2c6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:47 -0400 Subject: [PATCH 069/208] go get github.com/aws/aws-sdk-go-v2/service/codecommit. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cf88caabc9c..5e3a28eb464 100644 --- a/go.mod +++ b/go.mod @@ -57,7 +57,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.1 github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.1 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.1 - github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.0 + github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.1 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.0 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.0 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.0 diff --git a/go.sum b/go.sum index 85dc5cd911f..b7da49f078e 100644 --- a/go.sum +++ b/go.sum @@ -134,8 +134,8 @@ github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.1 h1:bnzjHm+ogGF+ldBxE/QX4L github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.1/go.mod h1:8M+F8tdWjmhBbEBrYZNEIqyaewVROyMpGbjAE0ezzaE= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.1 h1:/VqrREr150QUHg2sT3HyXruh75wgxNF/ovXJrNirwHo= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.1/go.mod h1:ssdLO5gMVtYjJywV9Qif/BMcJIF7TMrygQzP0FjZsJg= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.0 h1:tVN59Z3FGpGh4DMv/qrgsjplKXdm5NrHKpIVvvTgwxo= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.0/go.mod h1:9wxPodN0jhDQk1X/hiWrvQSCgIzuwTc+5zY/tLStRJM= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.1 h1:fUkMJntkDjreA6z/OjWu3Yo6GgflOb89MwJqkiKIhLc= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.1/go.mod h1:owSVfGgLWi8lpG+Ek9ngwErdBD9WJJJCNGYZDEb0JgM= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.0 h1:+GRYZ5t75fFMudQOW+IGH6zxaEy8NQQtt+oK9m8JbJY= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.0/go.mod h1:Q6sDZXeOksdwhHVQ+aKMMos5eoRV/BdBEBufkclSyBA= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.0 h1:C4lbzhM44DVeKSTYl5/mpRLdAx2mlsq//Cisko5LUzo= From d8e3deae787ebfa969bb689f251a4e349c99c2c8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:48 -0400 Subject: [PATCH 070/208] go get github.com/aws/aws-sdk-go-v2/service/codedeploy. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5e3a28eb464..0d85154c95e 100644 --- a/go.mod +++ b/go.mod @@ -58,7 +58,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.1 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.1 github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.1 - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.0 + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.1 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.0 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.0 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.0 diff --git a/go.sum b/go.sum index b7da49f078e..216dc898cd2 100644 --- a/go.sum +++ b/go.sum @@ -136,8 +136,8 @@ github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.1 h1:/VqrREr150QUHg2sT3H github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.1/go.mod h1:ssdLO5gMVtYjJywV9Qif/BMcJIF7TMrygQzP0FjZsJg= github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.1 h1:fUkMJntkDjreA6z/OjWu3Yo6GgflOb89MwJqkiKIhLc= github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.1/go.mod h1:owSVfGgLWi8lpG+Ek9ngwErdBD9WJJJCNGYZDEb0JgM= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.0 h1:+GRYZ5t75fFMudQOW+IGH6zxaEy8NQQtt+oK9m8JbJY= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.0/go.mod h1:Q6sDZXeOksdwhHVQ+aKMMos5eoRV/BdBEBufkclSyBA= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.1 h1:heUpqHgpEb36T8Tz2T/YgIhvGyrosFMniRcZ1tysvew= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.1/go.mod h1:rCdAG15aLhGEozOHpWNOEV3ZsT3FWDaOyxt2Vm+F2H8= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.0 h1:C4lbzhM44DVeKSTYl5/mpRLdAx2mlsq//Cisko5LUzo= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.0/go.mod h1:cmA9tSWcBVnogTkJ9HxXr4vmgvLJ+J0wy3oBRbnKMIM= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.0 h1:cJgrzf0XSfwyEfyMd6pGBAXLEuWrpbaAdX/gm5i0c/M= From 3be49478f3f7f596f2e5428ad89dd1db469653fc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:49 -0400 Subject: [PATCH 071/208] go get github.com/aws/aws-sdk-go-v2/service/codeguruprofiler. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0d85154c95e..6851c95df67 100644 --- a/go.mod +++ b/go.mod @@ -59,7 +59,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.1 github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.1 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.1 - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.0 + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.1 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.0 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.0 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.0 diff --git a/go.sum b/go.sum index 216dc898cd2..74cd53b22ac 100644 --- a/go.sum +++ b/go.sum @@ -138,8 +138,8 @@ github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.1 h1:fUkMJntkDjreA6z/OjWu3 github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.1/go.mod h1:owSVfGgLWi8lpG+Ek9ngwErdBD9WJJJCNGYZDEb0JgM= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.1 h1:heUpqHgpEb36T8Tz2T/YgIhvGyrosFMniRcZ1tysvew= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.1/go.mod h1:rCdAG15aLhGEozOHpWNOEV3ZsT3FWDaOyxt2Vm+F2H8= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.0 h1:C4lbzhM44DVeKSTYl5/mpRLdAx2mlsq//Cisko5LUzo= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.0/go.mod h1:cmA9tSWcBVnogTkJ9HxXr4vmgvLJ+J0wy3oBRbnKMIM= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.1 h1:kVltQrvq9OLClU0dErOa8X+oCup2MAnwYraJmIP12c0= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.1/go.mod h1:dHJf1FKp+UCZB8TzqD9It5mtH5bAgiJUPaw6NsCr18s= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.0 h1:cJgrzf0XSfwyEfyMd6pGBAXLEuWrpbaAdX/gm5i0c/M= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.0/go.mod h1:mKa4tKUsRWgMnvtDnvkIbOlGRlHWxM5S3ApXs4oZzC0= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.0 h1:v6PeeRF76JIfftHvIrBXApPmj5TF9ZgqoZaRgEkXpHo= From f221a52bb3c257ea59751626ae00c161b76c954f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:50 -0400 Subject: [PATCH 072/208] go get github.com/aws/aws-sdk-go-v2/service/codegurureviewer. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6851c95df67..760ef9f0811 100644 --- a/go.mod +++ b/go.mod @@ -60,7 +60,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.1 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.1 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.1 - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.0 + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.1 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.0 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.0 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.0 diff --git a/go.sum b/go.sum index 74cd53b22ac..f9f15baef8e 100644 --- a/go.sum +++ b/go.sum @@ -140,8 +140,8 @@ github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.1 h1:heUpqHgpEb36T8Tz2T/Yg github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.1/go.mod h1:rCdAG15aLhGEozOHpWNOEV3ZsT3FWDaOyxt2Vm+F2H8= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.1 h1:kVltQrvq9OLClU0dErOa8X+oCup2MAnwYraJmIP12c0= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.1/go.mod h1:dHJf1FKp+UCZB8TzqD9It5mtH5bAgiJUPaw6NsCr18s= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.0 h1:cJgrzf0XSfwyEfyMd6pGBAXLEuWrpbaAdX/gm5i0c/M= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.0/go.mod h1:mKa4tKUsRWgMnvtDnvkIbOlGRlHWxM5S3ApXs4oZzC0= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.1 h1:cWPRG82xZJvCPgWxU0whZ8oiKUPkZdDFSyWNNCq1pjk= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.1/go.mod h1:SLJpIkjNr4PoJp6i2gdclwswNmGkBsp2mx2+dfy7DKI= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.0 h1:v6PeeRF76JIfftHvIrBXApPmj5TF9ZgqoZaRgEkXpHo= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.0/go.mod h1:AeH5FpEbbnjaAk9kqyJVk2eH9e0XLkHbI40fEF+hjpA= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.0 h1:hMxeMa8aEe0DsAF+KgHkINyJ1qeiJ9pqL7xb4Q4PuIc= From 9dee305222d9f1683135d6469f92a7e96d6ec08c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:51 -0400 Subject: [PATCH 073/208] go get github.com/aws/aws-sdk-go-v2/service/codepipeline. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 760ef9f0811..e6e549b8de0 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.1 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.1 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.1 - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.0 + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.1 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.0 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.0 diff --git a/go.sum b/go.sum index f9f15baef8e..4edb4832f66 100644 --- a/go.sum +++ b/go.sum @@ -142,8 +142,8 @@ github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.1 h1:kVltQrvq9OLClU0 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.1/go.mod h1:dHJf1FKp+UCZB8TzqD9It5mtH5bAgiJUPaw6NsCr18s= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.1 h1:cWPRG82xZJvCPgWxU0whZ8oiKUPkZdDFSyWNNCq1pjk= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.1/go.mod h1:SLJpIkjNr4PoJp6i2gdclwswNmGkBsp2mx2+dfy7DKI= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.0 h1:v6PeeRF76JIfftHvIrBXApPmj5TF9ZgqoZaRgEkXpHo= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.0/go.mod h1:AeH5FpEbbnjaAk9kqyJVk2eH9e0XLkHbI40fEF+hjpA= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.1 h1:AmUVmQ2xPDib5oF4EgCx7+YW6RETtbtFfxhGbHi+EB0= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.1/go.mod h1:na6xq+0NoaHlXbCYTRvrULaHmLNSByUleyJy9euDhtQ= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.0 h1:hMxeMa8aEe0DsAF+KgHkINyJ1qeiJ9pqL7xb4Q4PuIc= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.0/go.mod h1:yYtKu78blthI45EdP2M6dbgLImAr9glsPhUFRdGcs3A= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.0 h1:q7gj1bSG1S1AdtUbxmMJfMSBNTB7lYNpOS9F3rgLOxo= From 8e5f86e1f103f308769cd21d2489ee9c56b41cd0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:52 -0400 Subject: [PATCH 074/208] go get github.com/aws/aws-sdk-go-v2/service/codestarconnections. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e6e549b8de0..5810300ea6d 100644 --- a/go.mod +++ b/go.mod @@ -62,7 +62,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.1 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.1 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.1 - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.0 + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.0 github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.0 diff --git a/go.sum b/go.sum index 4edb4832f66..0c61446a926 100644 --- a/go.sum +++ b/go.sum @@ -144,8 +144,8 @@ github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.1 h1:cWPRG82xZJvCPgW github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.1/go.mod h1:SLJpIkjNr4PoJp6i2gdclwswNmGkBsp2mx2+dfy7DKI= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.1 h1:AmUVmQ2xPDib5oF4EgCx7+YW6RETtbtFfxhGbHi+EB0= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.1/go.mod h1:na6xq+0NoaHlXbCYTRvrULaHmLNSByUleyJy9euDhtQ= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.0 h1:hMxeMa8aEe0DsAF+KgHkINyJ1qeiJ9pqL7xb4Q4PuIc= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.0/go.mod h1:yYtKu78blthI45EdP2M6dbgLImAr9glsPhUFRdGcs3A= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1 h1:wxAB1UmknXKQcaJ3/NYLERUJ7UMHmjAxC79qSDZ+gzE= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1/go.mod h1:2tYDH2oM9SobFKK8e1Tld+gNzFBoJ1tJx9BFE5WVd1Q= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.0 h1:q7gj1bSG1S1AdtUbxmMJfMSBNTB7lYNpOS9F3rgLOxo= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.0/go.mod h1:Epw+lxzb3qOMd+3gZhVuoh7S13h6BXP1W1dqWj6ANm4= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.0 h1:dYD6qKzSwJKa1/z0ZKp/82l5OaRHz1kDgcyPxR8RRK8= From ef48195d35ee808b87cfd6a434e73d3d278e10b9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:53 -0400 Subject: [PATCH 075/208] go get github.com/aws/aws-sdk-go-v2/service/codestarnotifications. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5810300ea6d..609334dec98 100644 --- a/go.mod +++ b/go.mod @@ -63,7 +63,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.1 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.1 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1 - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.0 + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.0 github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.0 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.0 diff --git a/go.sum b/go.sum index 0c61446a926..b1e2cc2d0e7 100644 --- a/go.sum +++ b/go.sum @@ -146,8 +146,8 @@ github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.1 h1:AmUVmQ2xPDib5oF4EgC github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.1/go.mod h1:na6xq+0NoaHlXbCYTRvrULaHmLNSByUleyJy9euDhtQ= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1 h1:wxAB1UmknXKQcaJ3/NYLERUJ7UMHmjAxC79qSDZ+gzE= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1/go.mod h1:2tYDH2oM9SobFKK8e1Tld+gNzFBoJ1tJx9BFE5WVd1Q= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.0 h1:q7gj1bSG1S1AdtUbxmMJfMSBNTB7lYNpOS9F3rgLOxo= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.0/go.mod h1:Epw+lxzb3qOMd+3gZhVuoh7S13h6BXP1W1dqWj6ANm4= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1 h1:Y6zYm5uoyV4eJyhLWyZ0CrMG7oGiGu0Q0AKDA+FInFk= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1/go.mod h1:eLxEKHbDZAZ21Kd9MoiVwTHuKNBfYSNgqp9IvtqodsA= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.0 h1:dYD6qKzSwJKa1/z0ZKp/82l5OaRHz1kDgcyPxR8RRK8= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.0/go.mod h1:GCf4z4EUKj4Y4N5kxbJfa+l//qsgbbHDe1dj+1yYT4E= github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.0 h1:lbxacb9zGdGOLLVNN/fE1NO5ppYS6tZLNMyvSwU3DiE= From 63e3ddcc02eb0f6d32293e72683955df7690f377 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:54 -0400 Subject: [PATCH 076/208] go get github.com/aws/aws-sdk-go-v2/service/cognitoidentity. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 609334dec98..df03c8f442a 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.1 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1 - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.0 + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1 github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.0 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.0 github.com/aws/aws-sdk-go-v2/service/configservice v1.47.0 diff --git a/go.sum b/go.sum index b1e2cc2d0e7..d18a3299391 100644 --- a/go.sum +++ b/go.sum @@ -148,8 +148,8 @@ github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1 h1:wxAB1UmknXKQ github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1/go.mod h1:2tYDH2oM9SobFKK8e1Tld+gNzFBoJ1tJx9BFE5WVd1Q= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1 h1:Y6zYm5uoyV4eJyhLWyZ0CrMG7oGiGu0Q0AKDA+FInFk= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1/go.mod h1:eLxEKHbDZAZ21Kd9MoiVwTHuKNBfYSNgqp9IvtqodsA= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.0 h1:dYD6qKzSwJKa1/z0ZKp/82l5OaRHz1kDgcyPxR8RRK8= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.0/go.mod h1:GCf4z4EUKj4Y4N5kxbJfa+l//qsgbbHDe1dj+1yYT4E= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1 h1:grnSpw0UYD7mZpV4cbIrHroG5geUkLdZG9Nw6y+2mY4= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1/go.mod h1:GjlJPEWhuchMZu+5ANvFJ40v2D/Yf15GKtSQrEii9g8= github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.0 h1:lbxacb9zGdGOLLVNN/fE1NO5ppYS6tZLNMyvSwU3DiE= github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.0/go.mod h1:sY0SMZ1KRagJ2ED5/F8S0A0oPz1brRzJnXF/gkvie1E= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.0 h1:HfCj8YhWHZzBGWwSBIWsRUyuaVcD0l3gtfpZZLu7Wko= From 2773128e7acc7486f5bb3513391c02b3cf88277f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:55 -0400 Subject: [PATCH 077/208] go get github.com/aws/aws-sdk-go-v2/service/comprehend. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index df03c8f442a..c4591093dc5 100644 --- a/go.mod +++ b/go.mod @@ -65,7 +65,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1 - github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.0 + github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.0 github.com/aws/aws-sdk-go-v2/service/configservice v1.47.0 github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.0 diff --git a/go.sum b/go.sum index d18a3299391..2f9b5be800c 100644 --- a/go.sum +++ b/go.sum @@ -150,8 +150,8 @@ github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1 h1:Y6zYm5uoyV github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1/go.mod h1:eLxEKHbDZAZ21Kd9MoiVwTHuKNBfYSNgqp9IvtqodsA= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1 h1:grnSpw0UYD7mZpV4cbIrHroG5geUkLdZG9Nw6y+2mY4= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1/go.mod h1:GjlJPEWhuchMZu+5ANvFJ40v2D/Yf15GKtSQrEii9g8= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.0 h1:lbxacb9zGdGOLLVNN/fE1NO5ppYS6tZLNMyvSwU3DiE= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.0/go.mod h1:sY0SMZ1KRagJ2ED5/F8S0A0oPz1brRzJnXF/gkvie1E= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1 h1:aaO83HGlxNkzuusYpfQKLb5p8Nh5fT9Z0AZGOMCgV0s= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1/go.mod h1:sceZD+zPJMiCXh57FxceWpqgNsNWST11mkCKKOxPzus= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.0 h1:HfCj8YhWHZzBGWwSBIWsRUyuaVcD0l3gtfpZZLu7Wko= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.0/go.mod h1:/PxDjyK/SWyUdk5mrq663qUeAdFjOyAVWQ/q0dNcZZI= github.com/aws/aws-sdk-go-v2/service/configservice v1.47.0 h1:U6EQANOy4eB5aP93NBhgBo4XAlVy/qf6CTNTZpvTUVA= From a94d0dd65383d65b74fa1035a83718a7f1dd948a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:55 -0400 Subject: [PATCH 078/208] go get github.com/aws/aws-sdk-go-v2/service/computeoptimizer. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c4591093dc5..cb68ef4f7ab 100644 --- a/go.mod +++ b/go.mod @@ -66,7 +66,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1 github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1 - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.0 + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.1 github.com/aws/aws-sdk-go-v2/service/configservice v1.47.0 github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.0 github.com/aws/aws-sdk-go-v2/service/controltower v1.15.0 diff --git a/go.sum b/go.sum index 2f9b5be800c..97985935e04 100644 --- a/go.sum +++ b/go.sum @@ -152,8 +152,8 @@ github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1 h1:grnSpw0UYD7mZpV4 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1/go.mod h1:GjlJPEWhuchMZu+5ANvFJ40v2D/Yf15GKtSQrEii9g8= github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1 h1:aaO83HGlxNkzuusYpfQKLb5p8Nh5fT9Z0AZGOMCgV0s= github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1/go.mod h1:sceZD+zPJMiCXh57FxceWpqgNsNWST11mkCKKOxPzus= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.0 h1:HfCj8YhWHZzBGWwSBIWsRUyuaVcD0l3gtfpZZLu7Wko= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.0/go.mod h1:/PxDjyK/SWyUdk5mrq663qUeAdFjOyAVWQ/q0dNcZZI= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.1 h1:YcD0FWopQ45wJls0DhI7jxEZ7eyupwep0rbRVKIILS8= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.1/go.mod h1:l1VImHHo3aeITpaaUdoeWkUwo6rCKz4Nc4oRYThfP6k= github.com/aws/aws-sdk-go-v2/service/configservice v1.47.0 h1:U6EQANOy4eB5aP93NBhgBo4XAlVy/qf6CTNTZpvTUVA= github.com/aws/aws-sdk-go-v2/service/configservice v1.47.0/go.mod h1:io3I6nvqdgD1Nq2x6xK0leLo+IsY2LsQXxFrPMZBYfs= github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.0 h1:A6GY24qgYzvWAAs8TyLmyrvX05IKsMtOPCFy/xu/BTE= From f812cff8d5a236a633f3091c7acddd39348829b8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:56 -0400 Subject: [PATCH 079/208] go get github.com/aws/aws-sdk-go-v2/service/configservice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cb68ef4f7ab..6b874f5a4d0 100644 --- a/go.mod +++ b/go.mod @@ -67,7 +67,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1 github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.1 - github.com/aws/aws-sdk-go-v2/service/configservice v1.47.0 + github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1 github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.0 github.com/aws/aws-sdk-go-v2/service/controltower v1.15.0 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.24.0 diff --git a/go.sum b/go.sum index 97985935e04..915a1ce174b 100644 --- a/go.sum +++ b/go.sum @@ -154,8 +154,8 @@ github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1 h1:aaO83HGlxNkzuusYpfQKL github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1/go.mod h1:sceZD+zPJMiCXh57FxceWpqgNsNWST11mkCKKOxPzus= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.1 h1:YcD0FWopQ45wJls0DhI7jxEZ7eyupwep0rbRVKIILS8= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.1/go.mod h1:l1VImHHo3aeITpaaUdoeWkUwo6rCKz4Nc4oRYThfP6k= -github.com/aws/aws-sdk-go-v2/service/configservice v1.47.0 h1:U6EQANOy4eB5aP93NBhgBo4XAlVy/qf6CTNTZpvTUVA= -github.com/aws/aws-sdk-go-v2/service/configservice v1.47.0/go.mod h1:io3I6nvqdgD1Nq2x6xK0leLo+IsY2LsQXxFrPMZBYfs= +github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1 h1:w1ARKEDr+JYVWNgAJQtZEYI88FS8FKv9aVdg7K67ri4= +github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1/go.mod h1:ExWsfT5TTjMkpt5HfiMCozowniFm1bxIZi6Z2DHjxGM= github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.0 h1:A6GY24qgYzvWAAs8TyLmyrvX05IKsMtOPCFy/xu/BTE= github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.0/go.mod h1:4g9AskDE1lsSbaHVkLCn+6vYai+u+agS7PCd9+wQzLA= github.com/aws/aws-sdk-go-v2/service/controltower v1.15.0 h1:bSxrwYKhquIB85XSZ4yhVjdDx74tzY/97O722vAJhko= From addb8555f0f3e7ef60260c94ad5dbb860cdeddc9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:57 -0400 Subject: [PATCH 080/208] go get github.com/aws/aws-sdk-go-v2/service/connectcases. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6b874f5a4d0..eb8f096fa33 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.1 github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1 - github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.0 + github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.1 github.com/aws/aws-sdk-go-v2/service/controltower v1.15.0 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.24.0 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.0 diff --git a/go.sum b/go.sum index 915a1ce174b..2d9f8aa81f2 100644 --- a/go.sum +++ b/go.sum @@ -156,8 +156,8 @@ github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.1 h1:YcD0FWopQ45wJls github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.1/go.mod h1:l1VImHHo3aeITpaaUdoeWkUwo6rCKz4Nc4oRYThfP6k= github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1 h1:w1ARKEDr+JYVWNgAJQtZEYI88FS8FKv9aVdg7K67ri4= github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1/go.mod h1:ExWsfT5TTjMkpt5HfiMCozowniFm1bxIZi6Z2DHjxGM= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.0 h1:A6GY24qgYzvWAAs8TyLmyrvX05IKsMtOPCFy/xu/BTE= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.0/go.mod h1:4g9AskDE1lsSbaHVkLCn+6vYai+u+agS7PCd9+wQzLA= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.1 h1:i6Gm6+KRs0TXIDETJzGdqol+y0Q02/2swZ0mtVFwTnU= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.1/go.mod h1:3I7C4pcZ++MDSDCHDkXEF+jGqs80Ggi4rnCNn/m0SHA= github.com/aws/aws-sdk-go-v2/service/controltower v1.15.0 h1:bSxrwYKhquIB85XSZ4yhVjdDx74tzY/97O722vAJhko= github.com/aws/aws-sdk-go-v2/service/controltower v1.15.0/go.mod h1:CFcv6L4uZ+mpY5bcbJ9HHPXTjBG9BpIz3AOTSpCvdqw= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.24.0 h1:HQI7FIQ9lSI5JpXMBwG6NQ/CvgUEQA4dcqvtpZ5grkY= From 09f6d47b281ede7701baf41e79cd5f3d3421ae74 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:58 -0400 Subject: [PATCH 081/208] go get github.com/aws/aws-sdk-go-v2/service/controltower. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index eb8f096fa33..71914bee9ad 100644 --- a/go.mod +++ b/go.mod @@ -69,7 +69,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.1 github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1 github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.1 - github.com/aws/aws-sdk-go-v2/service/controltower v1.15.0 + github.com/aws/aws-sdk-go-v2/service/controltower v1.15.1 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.24.0 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.0 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.0 diff --git a/go.sum b/go.sum index 2d9f8aa81f2..ceebdec0d1b 100644 --- a/go.sum +++ b/go.sum @@ -158,8 +158,8 @@ github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1 h1:w1ARKEDr+JYVWNgAJQ github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1/go.mod h1:ExWsfT5TTjMkpt5HfiMCozowniFm1bxIZi6Z2DHjxGM= github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.1 h1:i6Gm6+KRs0TXIDETJzGdqol+y0Q02/2swZ0mtVFwTnU= github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.1/go.mod h1:3I7C4pcZ++MDSDCHDkXEF+jGqs80Ggi4rnCNn/m0SHA= -github.com/aws/aws-sdk-go-v2/service/controltower v1.15.0 h1:bSxrwYKhquIB85XSZ4yhVjdDx74tzY/97O722vAJhko= -github.com/aws/aws-sdk-go-v2/service/controltower v1.15.0/go.mod h1:CFcv6L4uZ+mpY5bcbJ9HHPXTjBG9BpIz3AOTSpCvdqw= +github.com/aws/aws-sdk-go-v2/service/controltower v1.15.1 h1:QD/r0AtUhuGca+6P5dRFNrGLdhYEHttfCj62CoaWP48= +github.com/aws/aws-sdk-go-v2/service/controltower v1.15.1/go.mod h1:LVHPyB4s5aE7rvy2BHULX+2C2b8GTSwX6oAcBoDuYcw= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.24.0 h1:HQI7FIQ9lSI5JpXMBwG6NQ/CvgUEQA4dcqvtpZ5grkY= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.24.0/go.mod h1:3yHlvQo34SVrOeLt2z+XmhkBla7cl9PPnNbkH/09UaU= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.0 h1:Ybb0Chz4woaBvA5zBg5BkLflE7k19mUNNnGfdliCuFw= From 502b5e15e5a0c09caef70f6e28c857c8da7109fb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:39:59 -0400 Subject: [PATCH 082/208] go get github.com/aws/aws-sdk-go-v2/service/costandusagereportservice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 71914bee9ad..4bcdc08dc65 100644 --- a/go.mod +++ b/go.mod @@ -70,7 +70,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1 github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.1 github.com/aws/aws-sdk-go-v2/service/controltower v1.15.1 - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.24.0 + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.25.0 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.0 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.0 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.0 diff --git a/go.sum b/go.sum index ceebdec0d1b..82c00d14440 100644 --- a/go.sum +++ b/go.sum @@ -160,8 +160,8 @@ github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.1 h1:i6Gm6+KRs0TXIDETJzG github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.1/go.mod h1:3I7C4pcZ++MDSDCHDkXEF+jGqs80Ggi4rnCNn/m0SHA= github.com/aws/aws-sdk-go-v2/service/controltower v1.15.1 h1:QD/r0AtUhuGca+6P5dRFNrGLdhYEHttfCj62CoaWP48= github.com/aws/aws-sdk-go-v2/service/controltower v1.15.1/go.mod h1:LVHPyB4s5aE7rvy2BHULX+2C2b8GTSwX6oAcBoDuYcw= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.24.0 h1:HQI7FIQ9lSI5JpXMBwG6NQ/CvgUEQA4dcqvtpZ5grkY= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.24.0/go.mod h1:3yHlvQo34SVrOeLt2z+XmhkBla7cl9PPnNbkH/09UaU= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.25.0 h1:W9SVpLBFNnPgQtMQbGhlb6+VjsfITm0hBYLK0xMC48E= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.25.0/go.mod h1:1tpevg2QD6gPbSIPaWZFsyy3r/u70iJqg0uUHrgjOG8= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.0 h1:Ybb0Chz4woaBvA5zBg5BkLflE7k19mUNNnGfdliCuFw= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.0/go.mod h1:M0zVr8zXYjiaPaJxzCdjPSL5DTzPDqD9cwxIqRCweTY= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.0 h1:/sQS4Bbg7o0FT8sgTigUyjupfxeaNPy+aiCFYTD+9Pw= From 16eccde50ad0a0692e427d3c29999358a4b1d651 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:00 -0400 Subject: [PATCH 083/208] go get github.com/aws/aws-sdk-go-v2/service/costexplorer. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4bcdc08dc65..71a47e4f5ce 100644 --- a/go.mod +++ b/go.mod @@ -71,7 +71,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.1 github.com/aws/aws-sdk-go-v2/service/controltower v1.15.1 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.25.0 - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.0 + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.1 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.0 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.0 github.com/aws/aws-sdk-go-v2/service/datasync v1.39.0 diff --git a/go.sum b/go.sum index 82c00d14440..a46b774e7f7 100644 --- a/go.sum +++ b/go.sum @@ -162,8 +162,8 @@ github.com/aws/aws-sdk-go-v2/service/controltower v1.15.1 h1:QD/r0AtUhuGca+6P5dR github.com/aws/aws-sdk-go-v2/service/controltower v1.15.1/go.mod h1:LVHPyB4s5aE7rvy2BHULX+2C2b8GTSwX6oAcBoDuYcw= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.25.0 h1:W9SVpLBFNnPgQtMQbGhlb6+VjsfITm0hBYLK0xMC48E= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.25.0/go.mod h1:1tpevg2QD6gPbSIPaWZFsyy3r/u70iJqg0uUHrgjOG8= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.0 h1:Ybb0Chz4woaBvA5zBg5BkLflE7k19mUNNnGfdliCuFw= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.0/go.mod h1:M0zVr8zXYjiaPaJxzCdjPSL5DTzPDqD9cwxIqRCweTY= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.1 h1:oBVbeqeAVABwx7nPjHtrkjdWCsKw32zr0kem/ObNqtg= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.1/go.mod h1:NqSDny+Te4J9JM5IyrP0aywQVU51U/T7H9wZN3AQfe8= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.0 h1:/sQS4Bbg7o0FT8sgTigUyjupfxeaNPy+aiCFYTD+9Pw= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.0/go.mod h1:1rwIiJ8X0cE5Z/ohGae7APa/y0WnxKmMLM+Qro3Y2r8= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.0 h1:Mysy3wqQ/8WZ853AL2Q6uEIMkyxJ2N1DLqeAFdirXns= From b7de4e8ef11b590017892c8e8e882181a7dd6b01 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:00 -0400 Subject: [PATCH 084/208] go get github.com/aws/aws-sdk-go-v2/service/costoptimizationhub. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 71a47e4f5ce..2e0180d3446 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/controltower v1.15.1 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.25.0 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.1 - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.0 + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.1 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.0 github.com/aws/aws-sdk-go-v2/service/datasync v1.39.0 github.com/aws/aws-sdk-go-v2/service/datazone v1.10.0 diff --git a/go.sum b/go.sum index a46b774e7f7..75d1d5bd918 100644 --- a/go.sum +++ b/go.sum @@ -164,8 +164,8 @@ github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.25.0 h1:W9SVpL github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.25.0/go.mod h1:1tpevg2QD6gPbSIPaWZFsyy3r/u70iJqg0uUHrgjOG8= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.1 h1:oBVbeqeAVABwx7nPjHtrkjdWCsKw32zr0kem/ObNqtg= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.1/go.mod h1:NqSDny+Te4J9JM5IyrP0aywQVU51U/T7H9wZN3AQfe8= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.0 h1:/sQS4Bbg7o0FT8sgTigUyjupfxeaNPy+aiCFYTD+9Pw= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.0/go.mod h1:1rwIiJ8X0cE5Z/ohGae7APa/y0WnxKmMLM+Qro3Y2r8= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.1 h1:r1eywILs7CqOrHlCVk+VzRN+dakDAFLG3AP4aFpMFz4= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.1/go.mod h1:U++BfU7vu4wWCcbgEYJ1U3tGPhYS3yFmns/IcUyQQCU= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.0 h1:Mysy3wqQ/8WZ853AL2Q6uEIMkyxJ2N1DLqeAFdirXns= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.0/go.mod h1:25enS+qI7PKn+dIzAvhXH+0b74F5M6bxVL1Dbu3Yqrg= github.com/aws/aws-sdk-go-v2/service/datasync v1.39.0 h1:lUNkpy/yBLaZOWEcQfIxD4A2V1QMXSHHtPWgU0WFkjY= From 2c9159ffa73618752d8d502ca240f8e41494942a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:01 -0400 Subject: [PATCH 085/208] go get github.com/aws/aws-sdk-go-v2/service/customerprofiles. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2e0180d3446..d7b697b144d 100644 --- a/go.mod +++ b/go.mod @@ -73,7 +73,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.25.0 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.1 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.1 - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.0 + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.1 github.com/aws/aws-sdk-go-v2/service/datasync v1.39.0 github.com/aws/aws-sdk-go-v2/service/datazone v1.10.0 github.com/aws/aws-sdk-go-v2/service/dax v1.20.0 diff --git a/go.sum b/go.sum index 75d1d5bd918..606088a1434 100644 --- a/go.sum +++ b/go.sum @@ -166,8 +166,8 @@ github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.1 h1:oBVbeqeAVABwx7nPjHt github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.1/go.mod h1:NqSDny+Te4J9JM5IyrP0aywQVU51U/T7H9wZN3AQfe8= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.1 h1:r1eywILs7CqOrHlCVk+VzRN+dakDAFLG3AP4aFpMFz4= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.1/go.mod h1:U++BfU7vu4wWCcbgEYJ1U3tGPhYS3yFmns/IcUyQQCU= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.0 h1:Mysy3wqQ/8WZ853AL2Q6uEIMkyxJ2N1DLqeAFdirXns= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.0/go.mod h1:25enS+qI7PKn+dIzAvhXH+0b74F5M6bxVL1Dbu3Yqrg= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.1 h1:Q8qaVCxMxlq/dtyhsxeem0coJpHCt+yiGI0wGhdxXlg= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.1/go.mod h1:lhwc41j8YUBkPGK3VpX8+Ze/xrltyjVIJRJBerL5KVw= github.com/aws/aws-sdk-go-v2/service/datasync v1.39.0 h1:lUNkpy/yBLaZOWEcQfIxD4A2V1QMXSHHtPWgU0WFkjY= github.com/aws/aws-sdk-go-v2/service/datasync v1.39.0/go.mod h1:GDwumRrPG+UoXowosbT8ISPlywOEbeq+whAdap2ROzo= github.com/aws/aws-sdk-go-v2/service/datazone v1.10.0 h1:67U19JujMHzGz3XK0ScEJnoyW8+nh5c4V+sMVTyw1p4= From b906a151ecc78c5262208eca223f800cd4b1f392 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:02 -0400 Subject: [PATCH 086/208] go get github.com/aws/aws-sdk-go-v2/service/datasync. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d7b697b144d..f8340233bc1 100644 --- a/go.mod +++ b/go.mod @@ -74,7 +74,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.1 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.1 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.1 - github.com/aws/aws-sdk-go-v2/service/datasync v1.39.0 + github.com/aws/aws-sdk-go-v2/service/datasync v1.39.1 github.com/aws/aws-sdk-go-v2/service/datazone v1.10.0 github.com/aws/aws-sdk-go-v2/service/dax v1.20.0 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.0 diff --git a/go.sum b/go.sum index 606088a1434..14510e21505 100644 --- a/go.sum +++ b/go.sum @@ -168,8 +168,8 @@ github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.1 h1:r1eywILs7CqOr github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.1/go.mod h1:U++BfU7vu4wWCcbgEYJ1U3tGPhYS3yFmns/IcUyQQCU= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.1 h1:Q8qaVCxMxlq/dtyhsxeem0coJpHCt+yiGI0wGhdxXlg= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.1/go.mod h1:lhwc41j8YUBkPGK3VpX8+Ze/xrltyjVIJRJBerL5KVw= -github.com/aws/aws-sdk-go-v2/service/datasync v1.39.0 h1:lUNkpy/yBLaZOWEcQfIxD4A2V1QMXSHHtPWgU0WFkjY= -github.com/aws/aws-sdk-go-v2/service/datasync v1.39.0/go.mod h1:GDwumRrPG+UoXowosbT8ISPlywOEbeq+whAdap2ROzo= +github.com/aws/aws-sdk-go-v2/service/datasync v1.39.1 h1:uxWLMp0jcdV4Y4geESJoK/sRJZ5UR5ZXbsmO80o5G8w= +github.com/aws/aws-sdk-go-v2/service/datasync v1.39.1/go.mod h1:avtAoHgeYzxVtm41THxtBvtIYGwEiORu1qqOx9ozx9E= github.com/aws/aws-sdk-go-v2/service/datazone v1.10.0 h1:67U19JujMHzGz3XK0ScEJnoyW8+nh5c4V+sMVTyw1p4= github.com/aws/aws-sdk-go-v2/service/datazone v1.10.0/go.mod h1:l5uHXSeaVLtPNDHVtgk1nzjjwf/+BwcpXgON9gckMvo= github.com/aws/aws-sdk-go-v2/service/dax v1.20.0 h1:f3MqW79KuP3qHavzUZK55OaP5GC91Xgu5ZCx0oN+tUI= From aea7e1036a19abd9a125c519c3c84e3dad0e18d8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:03 -0400 Subject: [PATCH 087/208] go get github.com/aws/aws-sdk-go-v2/service/datazone. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f8340233bc1..50978b5d9af 100644 --- a/go.mod +++ b/go.mod @@ -75,7 +75,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.1 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.1 github.com/aws/aws-sdk-go-v2/service/datasync v1.39.1 - github.com/aws/aws-sdk-go-v2/service/datazone v1.10.0 + github.com/aws/aws-sdk-go-v2/service/datazone v1.10.1 github.com/aws/aws-sdk-go-v2/service/dax v1.20.0 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.0 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.0 diff --git a/go.sum b/go.sum index 14510e21505..1a4f3f47640 100644 --- a/go.sum +++ b/go.sum @@ -170,8 +170,8 @@ github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.1 h1:Q8qaVCxMxlq/dty github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.1/go.mod h1:lhwc41j8YUBkPGK3VpX8+Ze/xrltyjVIJRJBerL5KVw= github.com/aws/aws-sdk-go-v2/service/datasync v1.39.1 h1:uxWLMp0jcdV4Y4geESJoK/sRJZ5UR5ZXbsmO80o5G8w= github.com/aws/aws-sdk-go-v2/service/datasync v1.39.1/go.mod h1:avtAoHgeYzxVtm41THxtBvtIYGwEiORu1qqOx9ozx9E= -github.com/aws/aws-sdk-go-v2/service/datazone v1.10.0 h1:67U19JujMHzGz3XK0ScEJnoyW8+nh5c4V+sMVTyw1p4= -github.com/aws/aws-sdk-go-v2/service/datazone v1.10.0/go.mod h1:l5uHXSeaVLtPNDHVtgk1nzjjwf/+BwcpXgON9gckMvo= +github.com/aws/aws-sdk-go-v2/service/datazone v1.10.1 h1:uXlr3EF5ahh6++5dHGmAsYDe42uP/0c1Lcf53XulTlQ= +github.com/aws/aws-sdk-go-v2/service/datazone v1.10.1/go.mod h1:X60rbZ2iaL0HHJLO94rPQZVVd9nyXV+s601q/8zCIT8= github.com/aws/aws-sdk-go-v2/service/dax v1.20.0 h1:f3MqW79KuP3qHavzUZK55OaP5GC91Xgu5ZCx0oN+tUI= github.com/aws/aws-sdk-go-v2/service/dax v1.20.0/go.mod h1:crF1xZ0UuNSBKA9n/GZESG+AcLeHutdVrrRvEKW2sqM= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.0 h1:K9wGwAuzW472zGzdk4ERM0wNXvyWk6grlVLlJlpwhgI= From 6a84a8ba1e6b3b35c034654dd6704322444353f8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:04 -0400 Subject: [PATCH 088/208] go get github.com/aws/aws-sdk-go-v2/service/dax. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 50978b5d9af..8d4b77b8c83 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.1 github.com/aws/aws-sdk-go-v2/service/datasync v1.39.1 github.com/aws/aws-sdk-go-v2/service/datazone v1.10.1 - github.com/aws/aws-sdk-go-v2/service/dax v1.20.0 + github.com/aws/aws-sdk-go-v2/service/dax v1.20.1 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.0 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.0 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.0 diff --git a/go.sum b/go.sum index 1a4f3f47640..a456807e822 100644 --- a/go.sum +++ b/go.sum @@ -172,8 +172,8 @@ github.com/aws/aws-sdk-go-v2/service/datasync v1.39.1 h1:uxWLMp0jcdV4Y4geESJoK/s github.com/aws/aws-sdk-go-v2/service/datasync v1.39.1/go.mod h1:avtAoHgeYzxVtm41THxtBvtIYGwEiORu1qqOx9ozx9E= github.com/aws/aws-sdk-go-v2/service/datazone v1.10.1 h1:uXlr3EF5ahh6++5dHGmAsYDe42uP/0c1Lcf53XulTlQ= github.com/aws/aws-sdk-go-v2/service/datazone v1.10.1/go.mod h1:X60rbZ2iaL0HHJLO94rPQZVVd9nyXV+s601q/8zCIT8= -github.com/aws/aws-sdk-go-v2/service/dax v1.20.0 h1:f3MqW79KuP3qHavzUZK55OaP5GC91Xgu5ZCx0oN+tUI= -github.com/aws/aws-sdk-go-v2/service/dax v1.20.0/go.mod h1:crF1xZ0UuNSBKA9n/GZESG+AcLeHutdVrrRvEKW2sqM= +github.com/aws/aws-sdk-go-v2/service/dax v1.20.1 h1:TsVZKgA0lRq/tARfiabTJpxDp4SvhUN9oaGp6ysvsl8= +github.com/aws/aws-sdk-go-v2/service/dax v1.20.1/go.mod h1:GNQa0lb+sN8wYxvVveXs6NYj7QE/ln1S6Zq8vdLvluI= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.0 h1:K9wGwAuzW472zGzdk4ERM0wNXvyWk6grlVLlJlpwhgI= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.0/go.mod h1:doNhXXr3bB+0nzrBU5aL9MmqR/+63f4LTvDOTDn+9Jo= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.0 h1:UMzMSn+nZ3Fi/RvCzCjYmx19Ny4zJeq8vOJh5+e3MnY= From 1e9ff956f7fc966ddd8e48db1e59e7730b2a1367 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:05 -0400 Subject: [PATCH 089/208] go get github.com/aws/aws-sdk-go-v2/service/devicefarm. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8d4b77b8c83..1d4d5a47353 100644 --- a/go.mod +++ b/go.mod @@ -77,7 +77,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/datasync v1.39.1 github.com/aws/aws-sdk-go-v2/service/datazone v1.10.1 github.com/aws/aws-sdk-go-v2/service/dax v1.20.1 - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.0 + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.1 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.0 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.0 github.com/aws/aws-sdk-go-v2/service/dlm v1.25.0 diff --git a/go.sum b/go.sum index a456807e822..e453448f060 100644 --- a/go.sum +++ b/go.sum @@ -174,8 +174,8 @@ github.com/aws/aws-sdk-go-v2/service/datazone v1.10.1 h1:uXlr3EF5ahh6++5dHGmAsYD github.com/aws/aws-sdk-go-v2/service/datazone v1.10.1/go.mod h1:X60rbZ2iaL0HHJLO94rPQZVVd9nyXV+s601q/8zCIT8= github.com/aws/aws-sdk-go-v2/service/dax v1.20.1 h1:TsVZKgA0lRq/tARfiabTJpxDp4SvhUN9oaGp6ysvsl8= github.com/aws/aws-sdk-go-v2/service/dax v1.20.1/go.mod h1:GNQa0lb+sN8wYxvVveXs6NYj7QE/ln1S6Zq8vdLvluI= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.0 h1:K9wGwAuzW472zGzdk4ERM0wNXvyWk6grlVLlJlpwhgI= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.0/go.mod h1:doNhXXr3bB+0nzrBU5aL9MmqR/+63f4LTvDOTDn+9Jo= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.1 h1:YuAiH2QWZQBW37X1MtgZmS+vLVAZPnfZKcW/5b7LhGk= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.1/go.mod h1:K8JyqC+I7Itibe+jCmhUvk4SKjuImxIVEDRD+FcgDE0= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.0 h1:UMzMSn+nZ3Fi/RvCzCjYmx19Ny4zJeq8vOJh5+e3MnY= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.0/go.mod h1:aQ7PIqC5CXP5kp2bYZWavDiqyopZKCThO0PXGGs7PBM= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.0 h1:4u9ThMW+3Wnab1KDLVrHO/1V8RoyWgCTVlr2j5kgryI= From f24b0755aec8ac9c37d6c0f3aee6c95c6ddea138 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:06 -0400 Subject: [PATCH 090/208] go get github.com/aws/aws-sdk-go-v2/service/devopsguru. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1d4d5a47353..a959b46ea00 100644 --- a/go.mod +++ b/go.mod @@ -78,7 +78,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/datazone v1.10.1 github.com/aws/aws-sdk-go-v2/service/dax v1.20.1 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.1 - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.0 + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.1 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.0 github.com/aws/aws-sdk-go-v2/service/dlm v1.25.0 github.com/aws/aws-sdk-go-v2/service/docdb v1.35.0 diff --git a/go.sum b/go.sum index e453448f060..4c83b949039 100644 --- a/go.sum +++ b/go.sum @@ -176,8 +176,8 @@ github.com/aws/aws-sdk-go-v2/service/dax v1.20.1 h1:TsVZKgA0lRq/tARfiabTJpxDp4Sv github.com/aws/aws-sdk-go-v2/service/dax v1.20.1/go.mod h1:GNQa0lb+sN8wYxvVveXs6NYj7QE/ln1S6Zq8vdLvluI= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.1 h1:YuAiH2QWZQBW37X1MtgZmS+vLVAZPnfZKcW/5b7LhGk= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.1/go.mod h1:K8JyqC+I7Itibe+jCmhUvk4SKjuImxIVEDRD+FcgDE0= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.0 h1:UMzMSn+nZ3Fi/RvCzCjYmx19Ny4zJeq8vOJh5+e3MnY= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.0/go.mod h1:aQ7PIqC5CXP5kp2bYZWavDiqyopZKCThO0PXGGs7PBM= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.1 h1:GocOtSzQdS21YCifZ9tRWrOfXDJ07zxNrng0sA3lWmE= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.1/go.mod h1:cBYCVQQq4hoCGXmrFB4Ydp8RLiJQydstjQ6rpIWW77w= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.0 h1:4u9ThMW+3Wnab1KDLVrHO/1V8RoyWgCTVlr2j5kgryI= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.0/go.mod h1:FyvpPxwx5ncLB8b0z7sqBECy614PP2F2KqJC1kFyUxE= github.com/aws/aws-sdk-go-v2/service/dlm v1.25.0 h1:QPV1oGvIWQuvfm4D8kU4kI6WNuQfHTJ5uA99I/cOhp4= From 5bab9ca2312003aca3d1843ed826d81580534f17 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:07 -0400 Subject: [PATCH 091/208] go get github.com/aws/aws-sdk-go-v2/service/directoryservice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a959b46ea00..61d92721314 100644 --- a/go.mod +++ b/go.mod @@ -79,7 +79,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dax v1.20.1 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.1 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.1 - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.0 + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.1 github.com/aws/aws-sdk-go-v2/service/dlm v1.25.0 github.com/aws/aws-sdk-go-v2/service/docdb v1.35.0 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.0 diff --git a/go.sum b/go.sum index 4c83b949039..987ea61d845 100644 --- a/go.sum +++ b/go.sum @@ -178,8 +178,8 @@ github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.1 h1:YuAiH2QWZQBW37X1MtgZm github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.1/go.mod h1:K8JyqC+I7Itibe+jCmhUvk4SKjuImxIVEDRD+FcgDE0= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.1 h1:GocOtSzQdS21YCifZ9tRWrOfXDJ07zxNrng0sA3lWmE= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.1/go.mod h1:cBYCVQQq4hoCGXmrFB4Ydp8RLiJQydstjQ6rpIWW77w= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.0 h1:4u9ThMW+3Wnab1KDLVrHO/1V8RoyWgCTVlr2j5kgryI= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.0/go.mod h1:FyvpPxwx5ncLB8b0z7sqBECy614PP2F2KqJC1kFyUxE= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.1 h1:o73eXOlXE32xnr0Dawi5gzVLbdeVfYnQlKwqbbvTCcA= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.1/go.mod h1:+1wFFZEpA+srGWrQRLcXBLvpK2AaAAIyUDzu/9XNP98= github.com/aws/aws-sdk-go-v2/service/dlm v1.25.0 h1:QPV1oGvIWQuvfm4D8kU4kI6WNuQfHTJ5uA99I/cOhp4= github.com/aws/aws-sdk-go-v2/service/dlm v1.25.0/go.mod h1:CTM0SjMDpZOBu+azuk1Mw3jC5UhPwq4MrO0pPHtBEu4= github.com/aws/aws-sdk-go-v2/service/docdb v1.35.0 h1:XU0oBaQK9KPr4yP0ZtC4g/5yOOoaCNcnPB6m3E0YfCs= From 8716a99c665cc41901f79d7116a7ef92bd9977bc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:08 -0400 Subject: [PATCH 092/208] go get github.com/aws/aws-sdk-go-v2/service/dlm. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 61d92721314..b3dcade4287 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.1 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.1 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.1 - github.com/aws/aws-sdk-go-v2/service/dlm v1.25.0 + github.com/aws/aws-sdk-go-v2/service/dlm v1.25.1 github.com/aws/aws-sdk-go-v2/service/docdb v1.35.0 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.0 github.com/aws/aws-sdk-go-v2/service/drs v1.27.0 diff --git a/go.sum b/go.sum index 987ea61d845..6ed53cc4cd7 100644 --- a/go.sum +++ b/go.sum @@ -180,8 +180,8 @@ github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.1 h1:GocOtSzQdS21YCifZ9tRW github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.1/go.mod h1:cBYCVQQq4hoCGXmrFB4Ydp8RLiJQydstjQ6rpIWW77w= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.1 h1:o73eXOlXE32xnr0Dawi5gzVLbdeVfYnQlKwqbbvTCcA= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.1/go.mod h1:+1wFFZEpA+srGWrQRLcXBLvpK2AaAAIyUDzu/9XNP98= -github.com/aws/aws-sdk-go-v2/service/dlm v1.25.0 h1:QPV1oGvIWQuvfm4D8kU4kI6WNuQfHTJ5uA99I/cOhp4= -github.com/aws/aws-sdk-go-v2/service/dlm v1.25.0/go.mod h1:CTM0SjMDpZOBu+azuk1Mw3jC5UhPwq4MrO0pPHtBEu4= +github.com/aws/aws-sdk-go-v2/service/dlm v1.25.1 h1:PfGJEDIwkbHdha9Tl1bVea77oLyx40ytCYuJh6sm+g4= +github.com/aws/aws-sdk-go-v2/service/dlm v1.25.1/go.mod h1:fzgnfuz0rPeHLhymW+pQGStjpxyBj1Ejk4AjG9YcPZg= github.com/aws/aws-sdk-go-v2/service/docdb v1.35.0 h1:XU0oBaQK9KPr4yP0ZtC4g/5yOOoaCNcnPB6m3E0YfCs= github.com/aws/aws-sdk-go-v2/service/docdb v1.35.0/go.mod h1:tguc8Z/5tYRQ/zTREVtoGjTp1K9eZdJMqN0YCAagBXw= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.0 h1:32T80uFHi4ZMWpUXYpjcQLzGfRONpVagB1G+VbxYUC8= From d2b4c0c2338e3a136062ea423534484cacf449fb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:09 -0400 Subject: [PATCH 093/208] go get github.com/aws/aws-sdk-go-v2/service/docdb. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b3dcade4287..8cd2e31f08a 100644 --- a/go.mod +++ b/go.mod @@ -81,7 +81,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.1 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.1 github.com/aws/aws-sdk-go-v2/service/dlm v1.25.1 - github.com/aws/aws-sdk-go-v2/service/docdb v1.35.0 + github.com/aws/aws-sdk-go-v2/service/docdb v1.35.1 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.0 github.com/aws/aws-sdk-go-v2/service/drs v1.27.0 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.0 diff --git a/go.sum b/go.sum index 6ed53cc4cd7..e0028a3909f 100644 --- a/go.sum +++ b/go.sum @@ -182,8 +182,8 @@ github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.1 h1:o73eXOlXE32xnr0 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.1/go.mod h1:+1wFFZEpA+srGWrQRLcXBLvpK2AaAAIyUDzu/9XNP98= github.com/aws/aws-sdk-go-v2/service/dlm v1.25.1 h1:PfGJEDIwkbHdha9Tl1bVea77oLyx40ytCYuJh6sm+g4= github.com/aws/aws-sdk-go-v2/service/dlm v1.25.1/go.mod h1:fzgnfuz0rPeHLhymW+pQGStjpxyBj1Ejk4AjG9YcPZg= -github.com/aws/aws-sdk-go-v2/service/docdb v1.35.0 h1:XU0oBaQK9KPr4yP0ZtC4g/5yOOoaCNcnPB6m3E0YfCs= -github.com/aws/aws-sdk-go-v2/service/docdb v1.35.0/go.mod h1:tguc8Z/5tYRQ/zTREVtoGjTp1K9eZdJMqN0YCAagBXw= +github.com/aws/aws-sdk-go-v2/service/docdb v1.35.1 h1:ONQmD3KEK/HEN9Fd+DX97tN4spsRb8EigGX+Q2hkefE= +github.com/aws/aws-sdk-go-v2/service/docdb v1.35.1/go.mod h1:F8EZZZUOZ0QNB1wiYJ5LQuzQUvXg0RPfMkZfYVglEH8= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.0 h1:32T80uFHi4ZMWpUXYpjcQLzGfRONpVagB1G+VbxYUC8= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.0/go.mod h1:7Y6c5EtsLSYirM00nWqsJg/fIfboU0L+AfwMICufcJk= github.com/aws/aws-sdk-go-v2/service/drs v1.27.0 h1:5/H3aq02wXrDhncP60kSbUoyOTGPahR/t3dW9c5Y4YU= From 859f11c9dd5f97918b3a28238e9518d5d2b3fc06 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:09 -0400 Subject: [PATCH 094/208] go get github.com/aws/aws-sdk-go-v2/service/docdbelastic. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8cd2e31f08a..636a738f859 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.1 github.com/aws/aws-sdk-go-v2/service/dlm v1.25.1 github.com/aws/aws-sdk-go-v2/service/docdb v1.35.1 - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.0 + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.1 github.com/aws/aws-sdk-go-v2/service/drs v1.27.0 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.0 github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.0 diff --git a/go.sum b/go.sum index e0028a3909f..d1ab82337fe 100644 --- a/go.sum +++ b/go.sum @@ -184,8 +184,8 @@ github.com/aws/aws-sdk-go-v2/service/dlm v1.25.1 h1:PfGJEDIwkbHdha9Tl1bVea77oLyx github.com/aws/aws-sdk-go-v2/service/dlm v1.25.1/go.mod h1:fzgnfuz0rPeHLhymW+pQGStjpxyBj1Ejk4AjG9YcPZg= github.com/aws/aws-sdk-go-v2/service/docdb v1.35.1 h1:ONQmD3KEK/HEN9Fd+DX97tN4spsRb8EigGX+Q2hkefE= github.com/aws/aws-sdk-go-v2/service/docdb v1.35.1/go.mod h1:F8EZZZUOZ0QNB1wiYJ5LQuzQUvXg0RPfMkZfYVglEH8= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.0 h1:32T80uFHi4ZMWpUXYpjcQLzGfRONpVagB1G+VbxYUC8= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.0/go.mod h1:7Y6c5EtsLSYirM00nWqsJg/fIfboU0L+AfwMICufcJk= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.1 h1:GUkKn+uh75Hy8oXWSZV2cffzYiOg1jSmoKVSRNOlfRo= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.1/go.mod h1:FdbKmJnx2hriStRrPI7xrFVytgWoR0mVYPSLyZ/ftnw= github.com/aws/aws-sdk-go-v2/service/drs v1.27.0 h1:5/H3aq02wXrDhncP60kSbUoyOTGPahR/t3dW9c5Y4YU= github.com/aws/aws-sdk-go-v2/service/drs v1.27.0/go.mod h1:T+TlvSk14iPkBLujzsTEaPZ36cOyaz2MLH1ttuIwQCA= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.0 h1:PkT1xMKymZEvR8n5WM97XdLWwxQGxnDrqMaquPLI0UY= From 66f608d4e7eee79e61d309a8b4afa408f4535384 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:10 -0400 Subject: [PATCH 095/208] go get github.com/aws/aws-sdk-go-v2/service/drs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 636a738f859..4b1cb218b75 100644 --- a/go.mod +++ b/go.mod @@ -83,7 +83,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dlm v1.25.1 github.com/aws/aws-sdk-go-v2/service/docdb v1.35.1 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.1 - github.com/aws/aws-sdk-go-v2/service/drs v1.27.0 + github.com/aws/aws-sdk-go-v2/service/drs v1.27.1 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.0 github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.29.0 diff --git a/go.sum b/go.sum index d1ab82337fe..8001e309c2e 100644 --- a/go.sum +++ b/go.sum @@ -186,8 +186,8 @@ github.com/aws/aws-sdk-go-v2/service/docdb v1.35.1 h1:ONQmD3KEK/HEN9Fd+DX97tN4sp github.com/aws/aws-sdk-go-v2/service/docdb v1.35.1/go.mod h1:F8EZZZUOZ0QNB1wiYJ5LQuzQUvXg0RPfMkZfYVglEH8= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.1 h1:GUkKn+uh75Hy8oXWSZV2cffzYiOg1jSmoKVSRNOlfRo= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.1/go.mod h1:FdbKmJnx2hriStRrPI7xrFVytgWoR0mVYPSLyZ/ftnw= -github.com/aws/aws-sdk-go-v2/service/drs v1.27.0 h1:5/H3aq02wXrDhncP60kSbUoyOTGPahR/t3dW9c5Y4YU= -github.com/aws/aws-sdk-go-v2/service/drs v1.27.0/go.mod h1:T+TlvSk14iPkBLujzsTEaPZ36cOyaz2MLH1ttuIwQCA= +github.com/aws/aws-sdk-go-v2/service/drs v1.27.1 h1:iA5bnw47mK5BGe2bvk0JMwa+hrU5QI3ailkfospq26o= +github.com/aws/aws-sdk-go-v2/service/drs v1.27.1/go.mod h1:mADrs2xVSpoXKhmqO7etp2NgsCqvA/Si7tMITr7mnEk= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.0 h1:PkT1xMKymZEvR8n5WM97XdLWwxQGxnDrqMaquPLI0UY= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.0/go.mod h1:IpoHTdKbzTZUkF67mAGOcqndO7LA8yzMF9FbJbeAKIk= github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.0 h1:FQpJS76mmmo21FZn9FAutjAIxotNkiGXUYfUQN/RfGA= From 31ede96816590d49b07468268157e97652756fc9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:11 -0400 Subject: [PATCH 096/208] go get github.com/aws/aws-sdk-go-v2/service/dynamodb. --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 4b1cb218b75..aebe45fbf06 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/docdb v1.35.1 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.1 github.com/aws/aws-sdk-go-v2/service/drs v1.27.1 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.0 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.29.0 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.0 @@ -255,7 +255,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.14 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.12 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.13 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1 // indirect diff --git a/go.sum b/go.sum index 8001e309c2e..4e11c00b2c6 100644 --- a/go.sum +++ b/go.sum @@ -188,8 +188,8 @@ github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.1 h1:GUkKn+uh75Hy8oXWSZV github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.1/go.mod h1:FdbKmJnx2hriStRrPI7xrFVytgWoR0mVYPSLyZ/ftnw= github.com/aws/aws-sdk-go-v2/service/drs v1.27.1 h1:iA5bnw47mK5BGe2bvk0JMwa+hrU5QI3ailkfospq26o= github.com/aws/aws-sdk-go-v2/service/drs v1.27.1/go.mod h1:mADrs2xVSpoXKhmqO7etp2NgsCqvA/Si7tMITr7mnEk= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.0 h1:PkT1xMKymZEvR8n5WM97XdLWwxQGxnDrqMaquPLI0UY= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.0/go.mod h1:IpoHTdKbzTZUkF67mAGOcqndO7LA8yzMF9FbJbeAKIk= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.1 h1:9UiObaZsmKoR1k/dE6z/3laTkhkV0xnYXT8jIpMhuz8= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.1/go.mod h1:zU5eWYw3HNkPtcrFwBAdMv3+h3dFpmB0ng7z8wOuSPc= github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.0 h1:FQpJS76mmmo21FZn9FAutjAIxotNkiGXUYfUQN/RfGA= github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.0/go.mod h1:+dDvvbkwmJCZGzsSlsqEtJ6XhyG/hD2FHjIfpqcNl+o= github.com/aws/aws-sdk-go-v2/service/ecr v1.29.0 h1:5eON4rBQMHFTX7thxv4EQpRrombmiMsv3+wCEPewk+c= @@ -242,8 +242,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1x github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.14 h1:oWccitSnByVU74rQRHac4gLfDqjB6Z1YQGOY/dXKedI= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.14/go.mod h1:8SaZBlQdCLrc/2U3CEO48rYj9uR8qRsPRkmzwNM52pM= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.12 h1:IXSDCqEfL4oe4plEt0GkjkuI9T3tbVH91udMp7ZwV20= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.12/go.mod h1:47OjVuK2ib5x+7RLlacLxhZRlTnjlXAwal1BSXwj7Tk= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.13 h1:TiBHJdrItjSsvfMRMNEPvu4gFqor6aghaQ5mS18i77c= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.13/go.mod h1:XN5B38yJn1XZvhyCeTzU5Ypha6+7UzVGj2w+aN0zn3k= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 h1:zSDPny/pVnkqABXYRicYuPf9z2bTqfH13HT3v6UheIk= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14/go.mod h1:3TTcI5JSzda1nw/pkVC9dhgLre0SNBFj2lYS4GctXKI= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12 h1:tzha+v1SCEBpXWEuw6B/+jm4h5z8hZbTpXz0zRZqTnw= From ef1cf16508ecef30745a86b43418eacdf5feaede Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:12 -0400 Subject: [PATCH 097/208] go get github.com/aws/aws-sdk-go-v2/service/ec2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index aebe45fbf06..8fecde96aa2 100644 --- a/go.mod +++ b/go.mod @@ -85,7 +85,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.1 github.com/aws/aws-sdk-go-v2/service/drs v1.27.1 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.1 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1 github.com/aws/aws-sdk-go-v2/service/ecr v1.29.0 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.0 github.com/aws/aws-sdk-go-v2/service/ecs v1.43.0 diff --git a/go.sum b/go.sum index 4e11c00b2c6..65c8afcbf6c 100644 --- a/go.sum +++ b/go.sum @@ -190,8 +190,8 @@ github.com/aws/aws-sdk-go-v2/service/drs v1.27.1 h1:iA5bnw47mK5BGe2bvk0JMwa+hrU5 github.com/aws/aws-sdk-go-v2/service/drs v1.27.1/go.mod h1:mADrs2xVSpoXKhmqO7etp2NgsCqvA/Si7tMITr7mnEk= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.1 h1:9UiObaZsmKoR1k/dE6z/3laTkhkV0xnYXT8jIpMhuz8= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.1/go.mod h1:zU5eWYw3HNkPtcrFwBAdMv3+h3dFpmB0ng7z8wOuSPc= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.0 h1:FQpJS76mmmo21FZn9FAutjAIxotNkiGXUYfUQN/RfGA= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.0/go.mod h1:+dDvvbkwmJCZGzsSlsqEtJ6XhyG/hD2FHjIfpqcNl+o= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1 h1:LkSnU1c9JKJyXYcwpWgQGuwctwv3pDenMUgH2CmLd1A= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1/go.mod h1:Wv7N3iFOKVsZNIaw9MOBUmwCkX6VMmQQRFhMrHtNGno= github.com/aws/aws-sdk-go-v2/service/ecr v1.29.0 h1:5eON4rBQMHFTX7thxv4EQpRrombmiMsv3+wCEPewk+c= github.com/aws/aws-sdk-go-v2/service/ecr v1.29.0/go.mod h1:2BLsspQpxT8gg3dM6G5CZGXhrE/EpX8PeL2lsZ0zDKc= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.0 h1:5F9MRX4tyEdZ8L+7op99b+ie+1bxaKCf+i1QlCnochM= From b0aeb1922d50504b3da4b6abb303519d2301c3d3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:13 -0400 Subject: [PATCH 098/208] go get github.com/aws/aws-sdk-go-v2/service/ecr. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8fecde96aa2..b39417039ac 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/drs v1.27.1 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1 - github.com/aws/aws-sdk-go-v2/service/ecr v1.29.0 + github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.0 github.com/aws/aws-sdk-go-v2/service/ecs v1.43.0 github.com/aws/aws-sdk-go-v2/service/eks v1.44.0 diff --git a/go.sum b/go.sum index 65c8afcbf6c..31754cc8d63 100644 --- a/go.sum +++ b/go.sum @@ -192,8 +192,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.1 h1:9UiObaZsmKoR1k/dE6z/3la github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.1/go.mod h1:zU5eWYw3HNkPtcrFwBAdMv3+h3dFpmB0ng7z8wOuSPc= github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1 h1:LkSnU1c9JKJyXYcwpWgQGuwctwv3pDenMUgH2CmLd1A= github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1/go.mod h1:Wv7N3iFOKVsZNIaw9MOBUmwCkX6VMmQQRFhMrHtNGno= -github.com/aws/aws-sdk-go-v2/service/ecr v1.29.0 h1:5eON4rBQMHFTX7thxv4EQpRrombmiMsv3+wCEPewk+c= -github.com/aws/aws-sdk-go-v2/service/ecr v1.29.0/go.mod h1:2BLsspQpxT8gg3dM6G5CZGXhrE/EpX8PeL2lsZ0zDKc= +github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1 h1:ywNLJrn/Qn4enDsz/XnKlvpnLqvJxFGQV2BltWltbis= +github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1/go.mod h1:WadVIk+UrTvWuAsCp6BKGX4i2snurpz8mPWhJQnS7Dg= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.0 h1:5F9MRX4tyEdZ8L+7op99b+ie+1bxaKCf+i1QlCnochM= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.0/go.mod h1:Q1viq/XwLL61fNLG8k0mZmDEvHaGn98QcNewkxHXDSY= github.com/aws/aws-sdk-go-v2/service/ecs v1.43.0 h1:efgv9/bmag2npefcjkoLA7LIN2CfoUh2l3Zory7mhkk= From 9c824b3ca5d04acc748c42e4e0e34c25752e6195 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:14 -0400 Subject: [PATCH 099/208] go get github.com/aws/aws-sdk-go-v2/service/ecrpublic. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b39417039ac..7db32e37a35 100644 --- a/go.mod +++ b/go.mod @@ -87,7 +87,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1 github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1 - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.0 + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.43.0 github.com/aws/aws-sdk-go-v2/service/eks v1.44.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.0 diff --git a/go.sum b/go.sum index 31754cc8d63..347c585901c 100644 --- a/go.sum +++ b/go.sum @@ -194,8 +194,8 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1 h1:LkSnU1c9JKJyXYcwpWgQGuwctwv github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1/go.mod h1:Wv7N3iFOKVsZNIaw9MOBUmwCkX6VMmQQRFhMrHtNGno= github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1 h1:ywNLJrn/Qn4enDsz/XnKlvpnLqvJxFGQV2BltWltbis= github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1/go.mod h1:WadVIk+UrTvWuAsCp6BKGX4i2snurpz8mPWhJQnS7Dg= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.0 h1:5F9MRX4tyEdZ8L+7op99b+ie+1bxaKCf+i1QlCnochM= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.0/go.mod h1:Q1viq/XwLL61fNLG8k0mZmDEvHaGn98QcNewkxHXDSY= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.1 h1:Eq9i/mvOlGghiKe9NtsmeD9Wlwg8p4fbsqrMb3nWirM= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.1/go.mod h1:VtOgEoLEPV1YADuq+Z2XOK6/wKkGW2YK6DjChZ/GvDs= github.com/aws/aws-sdk-go-v2/service/ecs v1.43.0 h1:efgv9/bmag2npefcjkoLA7LIN2CfoUh2l3Zory7mhkk= github.com/aws/aws-sdk-go-v2/service/ecs v1.43.0/go.mod h1:30V0YAIaqPu/zgtVeuLmUht809PnYNOK8PUov7YE0fA= github.com/aws/aws-sdk-go-v2/service/eks v1.44.0 h1:+nNKonJ9cFCp07GTRc4ftQcw1Px/dyTvei1fHTpu+5M= From e71a0438b5a1c0499d4da3bba1eecb2c144ea4a3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:14 -0400 Subject: [PATCH 100/208] go get github.com/aws/aws-sdk-go-v2/service/ecs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7db32e37a35..1cef189ef19 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1 github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.1 - github.com/aws/aws-sdk-go-v2/service/ecs v1.43.0 + github.com/aws/aws-sdk-go-v2/service/ecs v1.43.1 github.com/aws/aws-sdk-go-v2/service/eks v1.44.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.0 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.0 diff --git a/go.sum b/go.sum index 347c585901c..f06852a6b42 100644 --- a/go.sum +++ b/go.sum @@ -196,8 +196,8 @@ github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1 h1:ywNLJrn/Qn4enDsz/XnKlvpnLqvJ github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1/go.mod h1:WadVIk+UrTvWuAsCp6BKGX4i2snurpz8mPWhJQnS7Dg= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.1 h1:Eq9i/mvOlGghiKe9NtsmeD9Wlwg8p4fbsqrMb3nWirM= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.1/go.mod h1:VtOgEoLEPV1YADuq+Z2XOK6/wKkGW2YK6DjChZ/GvDs= -github.com/aws/aws-sdk-go-v2/service/ecs v1.43.0 h1:efgv9/bmag2npefcjkoLA7LIN2CfoUh2l3Zory7mhkk= -github.com/aws/aws-sdk-go-v2/service/ecs v1.43.0/go.mod h1:30V0YAIaqPu/zgtVeuLmUht809PnYNOK8PUov7YE0fA= +github.com/aws/aws-sdk-go-v2/service/ecs v1.43.1 h1:Js5l/9hBLI4/enHaCezHxxoC0AQ1kh+h9TBjZEFIg1c= +github.com/aws/aws-sdk-go-v2/service/ecs v1.43.1/go.mod h1:a0NMSy8O5qyPn5Z8Lf0z/vyXry5Z60Vw23fYD1oRu/Y= github.com/aws/aws-sdk-go-v2/service/eks v1.44.0 h1:+nNKonJ9cFCp07GTRc4ftQcw1Px/dyTvei1fHTpu+5M= github.com/aws/aws-sdk-go-v2/service/eks v1.44.0/go.mod h1:l3Ce8Ls3SoCaqheT2UV5qfDw2Md+xCvjEVmtI+9ynpo= github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.0 h1:g054qAZjl0D2ISEUYfh1EvDV2Z6g8s3X606Q9iV6r/0= From dd7f6ecc59c20ee04b5871eb731bcbd99c19166d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:15 -0400 Subject: [PATCH 101/208] go get github.com/aws/aws-sdk-go-v2/service/eks. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1cef189ef19..b91c42ae96a 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.43.1 - github.com/aws/aws-sdk-go-v2/service/eks v1.44.0 + github.com/aws/aws-sdk-go-v2/service/eks v1.44.1 github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.0 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.0 diff --git a/go.sum b/go.sum index f06852a6b42..ad8914dbc86 100644 --- a/go.sum +++ b/go.sum @@ -198,8 +198,8 @@ github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.1 h1:Eq9i/mvOlGghiKe9NtsmeD github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.1/go.mod h1:VtOgEoLEPV1YADuq+Z2XOK6/wKkGW2YK6DjChZ/GvDs= github.com/aws/aws-sdk-go-v2/service/ecs v1.43.1 h1:Js5l/9hBLI4/enHaCezHxxoC0AQ1kh+h9TBjZEFIg1c= github.com/aws/aws-sdk-go-v2/service/ecs v1.43.1/go.mod h1:a0NMSy8O5qyPn5Z8Lf0z/vyXry5Z60Vw23fYD1oRu/Y= -github.com/aws/aws-sdk-go-v2/service/eks v1.44.0 h1:+nNKonJ9cFCp07GTRc4ftQcw1Px/dyTvei1fHTpu+5M= -github.com/aws/aws-sdk-go-v2/service/eks v1.44.0/go.mod h1:l3Ce8Ls3SoCaqheT2UV5qfDw2Md+xCvjEVmtI+9ynpo= +github.com/aws/aws-sdk-go-v2/service/eks v1.44.1 h1:onUAzZXDsyXzyrmOGw/9p8Csl1NZkTDEs4URZ8covUY= +github.com/aws/aws-sdk-go-v2/service/eks v1.44.1/go.mod h1:dg9l/W4hXygeRNydRB4LWKY/MwHJhfUomGJUBwI29Dw= github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.0 h1:g054qAZjl0D2ISEUYfh1EvDV2Z6g8s3X606Q9iV6r/0= github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.0/go.mod h1:AKYnQqdlH5hq65hpj73kZvAIu2JZnaBRxsGsu39JmM8= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.0 h1:luQaJXM8g3MRZPEbMzQ2ut3dx6QnG0sO1OYIe5VPCR4= From 87ced689540a1a8f192447985d9a30e1c19bdba1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:16 -0400 Subject: [PATCH 102/208] go get github.com/aws/aws-sdk-go-v2/service/elasticache. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b91c42ae96a..d20a024f0df 100644 --- a/go.mod +++ b/go.mod @@ -90,7 +90,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.43.1 github.com/aws/aws-sdk-go-v2/service/eks v1.44.1 - github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.0 + github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.1 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.0 github.com/aws/aws-sdk-go-v2/service/emr v1.40.0 diff --git a/go.sum b/go.sum index ad8914dbc86..bc923f6c146 100644 --- a/go.sum +++ b/go.sum @@ -200,8 +200,8 @@ github.com/aws/aws-sdk-go-v2/service/ecs v1.43.1 h1:Js5l/9hBLI4/enHaCezHxxoC0AQ1 github.com/aws/aws-sdk-go-v2/service/ecs v1.43.1/go.mod h1:a0NMSy8O5qyPn5Z8Lf0z/vyXry5Z60Vw23fYD1oRu/Y= github.com/aws/aws-sdk-go-v2/service/eks v1.44.1 h1:onUAzZXDsyXzyrmOGw/9p8Csl1NZkTDEs4URZ8covUY= github.com/aws/aws-sdk-go-v2/service/eks v1.44.1/go.mod h1:dg9l/W4hXygeRNydRB4LWKY/MwHJhfUomGJUBwI29Dw= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.0 h1:g054qAZjl0D2ISEUYfh1EvDV2Z6g8s3X606Q9iV6r/0= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.0/go.mod h1:AKYnQqdlH5hq65hpj73kZvAIu2JZnaBRxsGsu39JmM8= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.1 h1:XUOyv5Q0uypaCKkv1svwnhB9X76sRDoLUelBjzlFrL4= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.1/go.mod h1:RHxzPy8YHOOIEFxK5WYIsDA8TEDIBd8A0BenmqV9PKw= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.0 h1:luQaJXM8g3MRZPEbMzQ2ut3dx6QnG0sO1OYIe5VPCR4= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.0/go.mod h1:72t1RRQNbuAt0wYiYmw6IshZETm5gkmr75zFrZopFLU= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.0 h1:iMTooAw0vUOiY6byiaVQgtFUE2GsudZ9DTJwnmKb+K4= From d0e0ee3fce21cd8f412b900c0dc950d640a44a98 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:17 -0400 Subject: [PATCH 103/208] go get github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d20a024f0df..6c47c6e6767 100644 --- a/go.mod +++ b/go.mod @@ -91,7 +91,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecs v1.43.1 github.com/aws/aws-sdk-go-v2/service/eks v1.44.1 github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.1 - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.0 + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.0 github.com/aws/aws-sdk-go-v2/service/emr v1.40.0 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.0 diff --git a/go.sum b/go.sum index bc923f6c146..ff575bd8cc1 100644 --- a/go.sum +++ b/go.sum @@ -202,8 +202,8 @@ github.com/aws/aws-sdk-go-v2/service/eks v1.44.1 h1:onUAzZXDsyXzyrmOGw/9p8Csl1NZ github.com/aws/aws-sdk-go-v2/service/eks v1.44.1/go.mod h1:dg9l/W4hXygeRNydRB4LWKY/MwHJhfUomGJUBwI29Dw= github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.1 h1:XUOyv5Q0uypaCKkv1svwnhB9X76sRDoLUelBjzlFrL4= github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.1/go.mod h1:RHxzPy8YHOOIEFxK5WYIsDA8TEDIBd8A0BenmqV9PKw= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.0 h1:luQaJXM8g3MRZPEbMzQ2ut3dx6QnG0sO1OYIe5VPCR4= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.0/go.mod h1:72t1RRQNbuAt0wYiYmw6IshZETm5gkmr75zFrZopFLU= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.1 h1:JQpNrllBoHIKSzwLVFK/XYsUJBhDNvIaYVBQNf/9vk0= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.1/go.mod h1:JuMMy9DnDaLMb0pYz4v0kavMGRd+Me6kn5S9KWIUd4I= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.0 h1:iMTooAw0vUOiY6byiaVQgtFUE2GsudZ9DTJwnmKb+K4= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.0/go.mod h1:7dAQkaiNMiZGo0h3l5Il1v9E3eiqKW3DugEQmmJHoqo= github.com/aws/aws-sdk-go-v2/service/emr v1.40.0 h1:hWsQlAEHgHJIW2gkW+d+J4tPqZ9LRGBkvInZ3Mje9+A= From 7545ff097be0a0022a764cb9f3a145d42a80b5b3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:18 -0400 Subject: [PATCH 104/208] go get github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6c47c6e6767..e86d5828840 100644 --- a/go.mod +++ b/go.mod @@ -92,7 +92,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.44.1 github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.1 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.1 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.0 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.1 github.com/aws/aws-sdk-go-v2/service/emr v1.40.0 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.0 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.0 diff --git a/go.sum b/go.sum index ff575bd8cc1..7856b0aa1e8 100644 --- a/go.sum +++ b/go.sum @@ -204,8 +204,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.1 h1:XUOyv5Q0uypaCKkv1svw github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.1/go.mod h1:RHxzPy8YHOOIEFxK5WYIsDA8TEDIBd8A0BenmqV9PKw= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.1 h1:JQpNrllBoHIKSzwLVFK/XYsUJBhDNvIaYVBQNf/9vk0= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.1/go.mod h1:JuMMy9DnDaLMb0pYz4v0kavMGRd+Me6kn5S9KWIUd4I= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.0 h1:iMTooAw0vUOiY6byiaVQgtFUE2GsudZ9DTJwnmKb+K4= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.0/go.mod h1:7dAQkaiNMiZGo0h3l5Il1v9E3eiqKW3DugEQmmJHoqo= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.1 h1:whB9mAd0jcYqVF75rVASYdPPBEfZwGFLBq9rz0cHCoI= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.1/go.mod h1:EjPhusEHOS2hFIJFR3PfI4ndJLkhm3VKTWv0U5m+VR4= github.com/aws/aws-sdk-go-v2/service/emr v1.40.0 h1:hWsQlAEHgHJIW2gkW+d+J4tPqZ9LRGBkvInZ3Mje9+A= github.com/aws/aws-sdk-go-v2/service/emr v1.40.0/go.mod h1:5xmrleryUdXi+uFipHwKiDgUwIgZbGXn6hs7PZjnZTQ= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.0 h1:vW/D2ptwtnwjALuTz6FU5yENgTmFTH+3Cgsl43rDbMA= From f1adb7436c3382d1d53c643b98b3089f2eea6fbc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:18 -0400 Subject: [PATCH 105/208] go get github.com/aws/aws-sdk-go-v2/service/emr. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e86d5828840..3fd27406964 100644 --- a/go.mod +++ b/go.mod @@ -93,7 +93,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.1 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.1 - github.com/aws/aws-sdk-go-v2/service/emr v1.40.0 + github.com/aws/aws-sdk-go-v2/service/emr v1.40.1 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.0 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.0 github.com/aws/aws-sdk-go-v2/service/evidently v1.20.0 diff --git a/go.sum b/go.sum index 7856b0aa1e8..c11a12637b5 100644 --- a/go.sum +++ b/go.sum @@ -206,8 +206,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.1 h1:JQpNrllBoHIKSzw github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.1/go.mod h1:JuMMy9DnDaLMb0pYz4v0kavMGRd+Me6kn5S9KWIUd4I= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.1 h1:whB9mAd0jcYqVF75rVASYdPPBEfZwGFLBq9rz0cHCoI= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.1/go.mod h1:EjPhusEHOS2hFIJFR3PfI4ndJLkhm3VKTWv0U5m+VR4= -github.com/aws/aws-sdk-go-v2/service/emr v1.40.0 h1:hWsQlAEHgHJIW2gkW+d+J4tPqZ9LRGBkvInZ3Mje9+A= -github.com/aws/aws-sdk-go-v2/service/emr v1.40.0/go.mod h1:5xmrleryUdXi+uFipHwKiDgUwIgZbGXn6hs7PZjnZTQ= +github.com/aws/aws-sdk-go-v2/service/emr v1.40.1 h1:wH3N7EEy/KgQFvnH0qnrfAECHvlJ6DPiLlNJUgZEZO0= +github.com/aws/aws-sdk-go-v2/service/emr v1.40.1/go.mod h1:mw5LOzaQgE+8Oy0dfhvHeiZTZporvugTccq121K12PQ= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.0 h1:vW/D2ptwtnwjALuTz6FU5yENgTmFTH+3Cgsl43rDbMA= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.0/go.mod h1:ea+Ml3AQot2+q3j9zK/zyMaL3f1HoQq/wc3vR1FPTh8= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.0 h1:MyjnZtMEPJrI33u9+HPgqhFGi65sj+UOpfttPnoLQ8I= From 737ba721b9fd5592c0360df52f6dead1c5964d72 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:19 -0400 Subject: [PATCH 106/208] go get github.com/aws/aws-sdk-go-v2/service/emrserverless. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3fd27406964..2e025f39676 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.1 github.com/aws/aws-sdk-go-v2/service/emr v1.40.1 - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.0 + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.1 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.0 github.com/aws/aws-sdk-go-v2/service/evidently v1.20.0 github.com/aws/aws-sdk-go-v2/service/finspace v1.25.0 diff --git a/go.sum b/go.sum index c11a12637b5..3a70523b151 100644 --- a/go.sum +++ b/go.sum @@ -208,8 +208,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.1 h1:whB9mAd0j github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.1/go.mod h1:EjPhusEHOS2hFIJFR3PfI4ndJLkhm3VKTWv0U5m+VR4= github.com/aws/aws-sdk-go-v2/service/emr v1.40.1 h1:wH3N7EEy/KgQFvnH0qnrfAECHvlJ6DPiLlNJUgZEZO0= github.com/aws/aws-sdk-go-v2/service/emr v1.40.1/go.mod h1:mw5LOzaQgE+8Oy0dfhvHeiZTZporvugTccq121K12PQ= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.0 h1:vW/D2ptwtnwjALuTz6FU5yENgTmFTH+3Cgsl43rDbMA= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.0/go.mod h1:ea+Ml3AQot2+q3j9zK/zyMaL3f1HoQq/wc3vR1FPTh8= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.1 h1:PxYDKli6t4c4ZR9pUhdva/5c3ssvNvzmqoNFZxFQJG8= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.1/go.mod h1:sufrIA6wP/EydjURB33dtQreCXBm4ENL92tw6u6MmUU= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.0 h1:MyjnZtMEPJrI33u9+HPgqhFGi65sj+UOpfttPnoLQ8I= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.0/go.mod h1:MCMQtekAJCrg/M8lJrKVoVbsMl2MAU44RCKLdE5tQ4k= github.com/aws/aws-sdk-go-v2/service/evidently v1.20.0 h1:QdYEs3DC8oWu4cV8FnrLBZjFFrW5vDrTpeUxxOsUQJ0= From 1bb72b6b7deb9362505b49cda24f946fdf25a620 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:20 -0400 Subject: [PATCH 107/208] go get github.com/aws/aws-sdk-go-v2/service/eventbridge. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2e025f39676..5c226c81835 100644 --- a/go.mod +++ b/go.mod @@ -95,7 +95,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.1 github.com/aws/aws-sdk-go-v2/service/emr v1.40.1 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.1 - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.0 + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.1 github.com/aws/aws-sdk-go-v2/service/evidently v1.20.0 github.com/aws/aws-sdk-go-v2/service/finspace v1.25.0 github.com/aws/aws-sdk-go-v2/service/firehose v1.30.0 diff --git a/go.sum b/go.sum index 3a70523b151..b104f55b9a8 100644 --- a/go.sum +++ b/go.sum @@ -210,8 +210,8 @@ github.com/aws/aws-sdk-go-v2/service/emr v1.40.1 h1:wH3N7EEy/KgQFvnH0qnrfAECHvlJ github.com/aws/aws-sdk-go-v2/service/emr v1.40.1/go.mod h1:mw5LOzaQgE+8Oy0dfhvHeiZTZporvugTccq121K12PQ= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.1 h1:PxYDKli6t4c4ZR9pUhdva/5c3ssvNvzmqoNFZxFQJG8= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.1/go.mod h1:sufrIA6wP/EydjURB33dtQreCXBm4ENL92tw6u6MmUU= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.0 h1:MyjnZtMEPJrI33u9+HPgqhFGi65sj+UOpfttPnoLQ8I= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.0/go.mod h1:MCMQtekAJCrg/M8lJrKVoVbsMl2MAU44RCKLdE5tQ4k= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.1 h1:CC/texhRBbrlvDnholIlzoCXIPacah42iMJ5Qw17ZQQ= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.1/go.mod h1:3j+pcA1J4w7o1Sgt9maYlr+AXL6qPLjkmM+9oYTu+8Y= github.com/aws/aws-sdk-go-v2/service/evidently v1.20.0 h1:QdYEs3DC8oWu4cV8FnrLBZjFFrW5vDrTpeUxxOsUQJ0= github.com/aws/aws-sdk-go-v2/service/evidently v1.20.0/go.mod h1:sPuFaQ/DeK2FsJ1KzyLj8sO5g2IV8+0V28VCVk1hk8o= github.com/aws/aws-sdk-go-v2/service/finspace v1.25.0 h1:FelLYQ5vrVsgI4r3Q1hJJfKYbcRaj7kncgncF+sCm+Y= From 07cc6862d98d8b4b11a5e9c761c7d290e8576773 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:21 -0400 Subject: [PATCH 108/208] go get github.com/aws/aws-sdk-go-v2/service/evidently. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5c226c81835..a7610dd0917 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/emr v1.40.1 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.1 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.1 - github.com/aws/aws-sdk-go-v2/service/evidently v1.20.0 + github.com/aws/aws-sdk-go-v2/service/evidently v1.20.1 github.com/aws/aws-sdk-go-v2/service/finspace v1.25.0 github.com/aws/aws-sdk-go-v2/service/firehose v1.30.0 github.com/aws/aws-sdk-go-v2/service/fis v1.25.0 diff --git a/go.sum b/go.sum index b104f55b9a8..b34a434e263 100644 --- a/go.sum +++ b/go.sum @@ -212,8 +212,8 @@ github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.1 h1:PxYDKli6t4c4ZR9pUh github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.1/go.mod h1:sufrIA6wP/EydjURB33dtQreCXBm4ENL92tw6u6MmUU= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.1 h1:CC/texhRBbrlvDnholIlzoCXIPacah42iMJ5Qw17ZQQ= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.1/go.mod h1:3j+pcA1J4w7o1Sgt9maYlr+AXL6qPLjkmM+9oYTu+8Y= -github.com/aws/aws-sdk-go-v2/service/evidently v1.20.0 h1:QdYEs3DC8oWu4cV8FnrLBZjFFrW5vDrTpeUxxOsUQJ0= -github.com/aws/aws-sdk-go-v2/service/evidently v1.20.0/go.mod h1:sPuFaQ/DeK2FsJ1KzyLj8sO5g2IV8+0V28VCVk1hk8o= +github.com/aws/aws-sdk-go-v2/service/evidently v1.20.1 h1:VQ3R9AC/NnbJTYOG1t8leoOU/lZ5MeF4Wd3hKG1TCEQ= +github.com/aws/aws-sdk-go-v2/service/evidently v1.20.1/go.mod h1:bcnYJJZnP2/iAYSYBZr757pfeusnDvsr/w/nxYjLSu4= github.com/aws/aws-sdk-go-v2/service/finspace v1.25.0 h1:FelLYQ5vrVsgI4r3Q1hJJfKYbcRaj7kncgncF+sCm+Y= github.com/aws/aws-sdk-go-v2/service/finspace v1.25.0/go.mod h1:rSCRrHyvoKMZxPznz9FMC1lwK8DE4qLURw2rzMiEEMQ= github.com/aws/aws-sdk-go-v2/service/firehose v1.30.0 h1:xDay+EZfe0OZKrx/Wtjhcweie3w+m01gpyexTebEA6U= From aa3abfc0bf8a2182d95fc35b98afcc61f70a8c44 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:21 -0400 Subject: [PATCH 109/208] go get github.com/aws/aws-sdk-go-v2/service/finspace. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a7610dd0917..59dfce9979d 100644 --- a/go.mod +++ b/go.mod @@ -97,7 +97,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.1 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.1 github.com/aws/aws-sdk-go-v2/service/evidently v1.20.1 - github.com/aws/aws-sdk-go-v2/service/finspace v1.25.0 + github.com/aws/aws-sdk-go-v2/service/finspace v1.25.1 github.com/aws/aws-sdk-go-v2/service/firehose v1.30.0 github.com/aws/aws-sdk-go-v2/service/fis v1.25.0 github.com/aws/aws-sdk-go-v2/service/fms v1.34.0 diff --git a/go.sum b/go.sum index b34a434e263..c04e40f0f62 100644 --- a/go.sum +++ b/go.sum @@ -214,8 +214,8 @@ github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.1 h1:CC/texhRBbrlvDnholIl github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.1/go.mod h1:3j+pcA1J4w7o1Sgt9maYlr+AXL6qPLjkmM+9oYTu+8Y= github.com/aws/aws-sdk-go-v2/service/evidently v1.20.1 h1:VQ3R9AC/NnbJTYOG1t8leoOU/lZ5MeF4Wd3hKG1TCEQ= github.com/aws/aws-sdk-go-v2/service/evidently v1.20.1/go.mod h1:bcnYJJZnP2/iAYSYBZr757pfeusnDvsr/w/nxYjLSu4= -github.com/aws/aws-sdk-go-v2/service/finspace v1.25.0 h1:FelLYQ5vrVsgI4r3Q1hJJfKYbcRaj7kncgncF+sCm+Y= -github.com/aws/aws-sdk-go-v2/service/finspace v1.25.0/go.mod h1:rSCRrHyvoKMZxPznz9FMC1lwK8DE4qLURw2rzMiEEMQ= +github.com/aws/aws-sdk-go-v2/service/finspace v1.25.1 h1:AzE9MtNhz2ShTfmv0E9hAbCEiQ0tbLbi6MJ8G3rBLX8= +github.com/aws/aws-sdk-go-v2/service/finspace v1.25.1/go.mod h1:wFw2JQRHqId9j7TLuud2hVySpj3Kl2FyDTzk11U7VlI= github.com/aws/aws-sdk-go-v2/service/firehose v1.30.0 h1:xDay+EZfe0OZKrx/Wtjhcweie3w+m01gpyexTebEA6U= github.com/aws/aws-sdk-go-v2/service/firehose v1.30.0/go.mod h1:GST/Kf+NkoLXbC7wXkaqnXQV1F/Pt6ezlK8Sza3QdDY= github.com/aws/aws-sdk-go-v2/service/fis v1.25.0 h1:LzC+g87pqfTlpT5779D86/jp55HgqjyLFz49aI8bkNM= From 9724c60a348972fdbcd9983431c24f8226a363ef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:22 -0400 Subject: [PATCH 110/208] go get github.com/aws/aws-sdk-go-v2/service/firehose. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 59dfce9979d..a604aa7f4b1 100644 --- a/go.mod +++ b/go.mod @@ -98,7 +98,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.1 github.com/aws/aws-sdk-go-v2/service/evidently v1.20.1 github.com/aws/aws-sdk-go-v2/service/finspace v1.25.1 - github.com/aws/aws-sdk-go-v2/service/firehose v1.30.0 + github.com/aws/aws-sdk-go-v2/service/firehose v1.30.1 github.com/aws/aws-sdk-go-v2/service/fis v1.25.0 github.com/aws/aws-sdk-go-v2/service/fms v1.34.0 github.com/aws/aws-sdk-go-v2/service/glacier v1.23.0 diff --git a/go.sum b/go.sum index c04e40f0f62..7a001d11b79 100644 --- a/go.sum +++ b/go.sum @@ -216,8 +216,8 @@ github.com/aws/aws-sdk-go-v2/service/evidently v1.20.1 h1:VQ3R9AC/NnbJTYOG1t8leo github.com/aws/aws-sdk-go-v2/service/evidently v1.20.1/go.mod h1:bcnYJJZnP2/iAYSYBZr757pfeusnDvsr/w/nxYjLSu4= github.com/aws/aws-sdk-go-v2/service/finspace v1.25.1 h1:AzE9MtNhz2ShTfmv0E9hAbCEiQ0tbLbi6MJ8G3rBLX8= github.com/aws/aws-sdk-go-v2/service/finspace v1.25.1/go.mod h1:wFw2JQRHqId9j7TLuud2hVySpj3Kl2FyDTzk11U7VlI= -github.com/aws/aws-sdk-go-v2/service/firehose v1.30.0 h1:xDay+EZfe0OZKrx/Wtjhcweie3w+m01gpyexTebEA6U= -github.com/aws/aws-sdk-go-v2/service/firehose v1.30.0/go.mod h1:GST/Kf+NkoLXbC7wXkaqnXQV1F/Pt6ezlK8Sza3QdDY= +github.com/aws/aws-sdk-go-v2/service/firehose v1.30.1 h1:rUjrt0TdN9J3fXoAR48jQYPZG9CuTFFx8sRvNeewsFA= +github.com/aws/aws-sdk-go-v2/service/firehose v1.30.1/go.mod h1:OfHMrSBBxqqMlNKxYS+qN1iEIlak7LmjQokzFocNdEw= github.com/aws/aws-sdk-go-v2/service/fis v1.25.0 h1:LzC+g87pqfTlpT5779D86/jp55HgqjyLFz49aI8bkNM= github.com/aws/aws-sdk-go-v2/service/fis v1.25.0/go.mod h1:gApaUrNvjKaFimyr9E09MaCHTN6N2nRtApRVS3rYb7A= github.com/aws/aws-sdk-go-v2/service/fms v1.34.0 h1:btGAO2JhzkxagPmb6u4oY3UdxQYeRJv09rVSj9YObqU= From d1b738c2a60dab98dff014c50edc28d5a1e86399 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:23 -0400 Subject: [PATCH 111/208] go get github.com/aws/aws-sdk-go-v2/service/fis. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a604aa7f4b1..1aa21e15095 100644 --- a/go.mod +++ b/go.mod @@ -99,7 +99,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/evidently v1.20.1 github.com/aws/aws-sdk-go-v2/service/finspace v1.25.1 github.com/aws/aws-sdk-go-v2/service/firehose v1.30.1 - github.com/aws/aws-sdk-go-v2/service/fis v1.25.0 + github.com/aws/aws-sdk-go-v2/service/fis v1.25.1 github.com/aws/aws-sdk-go-v2/service/fms v1.34.0 github.com/aws/aws-sdk-go-v2/service/glacier v1.23.0 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.0 diff --git a/go.sum b/go.sum index 7a001d11b79..4816c82c4c8 100644 --- a/go.sum +++ b/go.sum @@ -218,8 +218,8 @@ github.com/aws/aws-sdk-go-v2/service/finspace v1.25.1 h1:AzE9MtNhz2ShTfmv0E9hAbC github.com/aws/aws-sdk-go-v2/service/finspace v1.25.1/go.mod h1:wFw2JQRHqId9j7TLuud2hVySpj3Kl2FyDTzk11U7VlI= github.com/aws/aws-sdk-go-v2/service/firehose v1.30.1 h1:rUjrt0TdN9J3fXoAR48jQYPZG9CuTFFx8sRvNeewsFA= github.com/aws/aws-sdk-go-v2/service/firehose v1.30.1/go.mod h1:OfHMrSBBxqqMlNKxYS+qN1iEIlak7LmjQokzFocNdEw= -github.com/aws/aws-sdk-go-v2/service/fis v1.25.0 h1:LzC+g87pqfTlpT5779D86/jp55HgqjyLFz49aI8bkNM= -github.com/aws/aws-sdk-go-v2/service/fis v1.25.0/go.mod h1:gApaUrNvjKaFimyr9E09MaCHTN6N2nRtApRVS3rYb7A= +github.com/aws/aws-sdk-go-v2/service/fis v1.25.1 h1:3QgBUXHUBlAR0C7U4NnW06AOFCu+k35NLNQebJ/ZFi0= +github.com/aws/aws-sdk-go-v2/service/fis v1.25.1/go.mod h1:ZNsquchu106IZ++PAiwBDjmcOeALzBSPMHKNgwnsFwg= github.com/aws/aws-sdk-go-v2/service/fms v1.34.0 h1:btGAO2JhzkxagPmb6u4oY3UdxQYeRJv09rVSj9YObqU= github.com/aws/aws-sdk-go-v2/service/fms v1.34.0/go.mod h1:pzeU9c8sSZiL0SlAjY/jFBvsYDZnk052Rbq+E/NdcHU= github.com/aws/aws-sdk-go-v2/service/glacier v1.23.0 h1:aq0q+CifJj5URlsqSdZA8+LeSCl+RkxXZYEu2kXkTuM= From b4fb6e18ac9e8f7a69133324ef176ba7f3ae4ec4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:24 -0400 Subject: [PATCH 112/208] go get github.com/aws/aws-sdk-go-v2/service/fms. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1aa21e15095..ed937c241b3 100644 --- a/go.mod +++ b/go.mod @@ -100,7 +100,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/finspace v1.25.1 github.com/aws/aws-sdk-go-v2/service/firehose v1.30.1 github.com/aws/aws-sdk-go-v2/service/fis v1.25.1 - github.com/aws/aws-sdk-go-v2/service/fms v1.34.0 + github.com/aws/aws-sdk-go-v2/service/fms v1.34.1 github.com/aws/aws-sdk-go-v2/service/glacier v1.23.0 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.0 github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.0 diff --git a/go.sum b/go.sum index 4816c82c4c8..105b0eba33d 100644 --- a/go.sum +++ b/go.sum @@ -220,8 +220,8 @@ github.com/aws/aws-sdk-go-v2/service/firehose v1.30.1 h1:rUjrt0TdN9J3fXoAR48jQYP github.com/aws/aws-sdk-go-v2/service/firehose v1.30.1/go.mod h1:OfHMrSBBxqqMlNKxYS+qN1iEIlak7LmjQokzFocNdEw= github.com/aws/aws-sdk-go-v2/service/fis v1.25.1 h1:3QgBUXHUBlAR0C7U4NnW06AOFCu+k35NLNQebJ/ZFi0= github.com/aws/aws-sdk-go-v2/service/fis v1.25.1/go.mod h1:ZNsquchu106IZ++PAiwBDjmcOeALzBSPMHKNgwnsFwg= -github.com/aws/aws-sdk-go-v2/service/fms v1.34.0 h1:btGAO2JhzkxagPmb6u4oY3UdxQYeRJv09rVSj9YObqU= -github.com/aws/aws-sdk-go-v2/service/fms v1.34.0/go.mod h1:pzeU9c8sSZiL0SlAjY/jFBvsYDZnk052Rbq+E/NdcHU= +github.com/aws/aws-sdk-go-v2/service/fms v1.34.1 h1:syweqXph4uS8LY+MjwsSt29N457s1U/4B/9OUE02fI4= +github.com/aws/aws-sdk-go-v2/service/fms v1.34.1/go.mod h1:9tSGhVWwdYbj0TKzLzvZpsEwRCdzcVi/HC4YNKEsLQ8= github.com/aws/aws-sdk-go-v2/service/glacier v1.23.0 h1:aq0q+CifJj5URlsqSdZA8+LeSCl+RkxXZYEu2kXkTuM= github.com/aws/aws-sdk-go-v2/service/glacier v1.23.0/go.mod h1:Ydh2fORQhB33j3aeqFzzRqxyFJdr1j2a3eoAH9jJ348= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.0 h1:9P29s6K5fEDh1oOgjj+FRxYF1IwI73+vi7wycuy/FKA= From e4b3ccbafb3785f182c8796600caaea2fc98d7b5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:25 -0400 Subject: [PATCH 113/208] go get github.com/aws/aws-sdk-go-v2/service/glacier. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ed937c241b3..a540981bbf9 100644 --- a/go.mod +++ b/go.mod @@ -101,7 +101,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/firehose v1.30.1 github.com/aws/aws-sdk-go-v2/service/fis v1.25.1 github.com/aws/aws-sdk-go-v2/service/fms v1.34.1 - github.com/aws/aws-sdk-go-v2/service/glacier v1.23.0 + github.com/aws/aws-sdk-go-v2/service/glacier v1.23.1 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.0 github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.0 github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.0 diff --git a/go.sum b/go.sum index 105b0eba33d..d21dae4c6e5 100644 --- a/go.sum +++ b/go.sum @@ -222,8 +222,8 @@ github.com/aws/aws-sdk-go-v2/service/fis v1.25.1 h1:3QgBUXHUBlAR0C7U4NnW06AOFCu+ github.com/aws/aws-sdk-go-v2/service/fis v1.25.1/go.mod h1:ZNsquchu106IZ++PAiwBDjmcOeALzBSPMHKNgwnsFwg= github.com/aws/aws-sdk-go-v2/service/fms v1.34.1 h1:syweqXph4uS8LY+MjwsSt29N457s1U/4B/9OUE02fI4= github.com/aws/aws-sdk-go-v2/service/fms v1.34.1/go.mod h1:9tSGhVWwdYbj0TKzLzvZpsEwRCdzcVi/HC4YNKEsLQ8= -github.com/aws/aws-sdk-go-v2/service/glacier v1.23.0 h1:aq0q+CifJj5URlsqSdZA8+LeSCl+RkxXZYEu2kXkTuM= -github.com/aws/aws-sdk-go-v2/service/glacier v1.23.0/go.mod h1:Ydh2fORQhB33j3aeqFzzRqxyFJdr1j2a3eoAH9jJ348= +github.com/aws/aws-sdk-go-v2/service/glacier v1.23.1 h1:nUOHgAUOnQth5+fMWgCQiOEqH73fgqmueimUYJE/7rQ= +github.com/aws/aws-sdk-go-v2/service/glacier v1.23.1/go.mod h1:29ythAZEVnLPIOCpzENgCzvZLoAHt8S8BHryPpm8EyI= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.0 h1:9P29s6K5fEDh1oOgjj+FRxYF1IwI73+vi7wycuy/FKA= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.0/go.mod h1:BAqdH8ZBbv0JdKe7r9DxlU/FmF4WGIYEsJuV6g4tIf0= github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.0 h1:IrOlyBLb6XjB/iz0NoUSDjLCUYCHKKVxSrZUExb8tZ4= From 23be9a7e7baeabe0555b8b4e60bb580d840385d2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:26 -0400 Subject: [PATCH 114/208] go get github.com/aws/aws-sdk-go-v2/service/globalaccelerator. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a540981bbf9..5ec85a1d349 100644 --- a/go.mod +++ b/go.mod @@ -102,7 +102,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/fis v1.25.1 github.com/aws/aws-sdk-go-v2/service/fms v1.34.1 github.com/aws/aws-sdk-go-v2/service/glacier v1.23.1 - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.0 + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.1 github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.0 github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.0 github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.0 diff --git a/go.sum b/go.sum index d21dae4c6e5..d5d1592b3e4 100644 --- a/go.sum +++ b/go.sum @@ -224,8 +224,8 @@ github.com/aws/aws-sdk-go-v2/service/fms v1.34.1 h1:syweqXph4uS8LY+MjwsSt29N457s github.com/aws/aws-sdk-go-v2/service/fms v1.34.1/go.mod h1:9tSGhVWwdYbj0TKzLzvZpsEwRCdzcVi/HC4YNKEsLQ8= github.com/aws/aws-sdk-go-v2/service/glacier v1.23.1 h1:nUOHgAUOnQth5+fMWgCQiOEqH73fgqmueimUYJE/7rQ= github.com/aws/aws-sdk-go-v2/service/glacier v1.23.1/go.mod h1:29ythAZEVnLPIOCpzENgCzvZLoAHt8S8BHryPpm8EyI= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.0 h1:9P29s6K5fEDh1oOgjj+FRxYF1IwI73+vi7wycuy/FKA= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.0/go.mod h1:BAqdH8ZBbv0JdKe7r9DxlU/FmF4WGIYEsJuV6g4tIf0= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.1 h1:7C51ZbOLStv+VJwdiKGzJeKK0LPX6+XTJv199Q9xe0U= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.1/go.mod h1:VSQN6t3mMZfL/CEC2sg+MaSDv7A9sTFFhIB82k7zexA= github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.0 h1:IrOlyBLb6XjB/iz0NoUSDjLCUYCHKKVxSrZUExb8tZ4= github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.0/go.mod h1:gdMcdxtsqAvXMXqQpRmq8p06d7z6EAHb8mAP18K7duU= github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.0 h1:1sIp9dUD3J7rPIHS9PvwJI7mIWtFP6e8RHy+RiUQZFo= From 30ccf7e2d968c2605047cac5ffaaa560245aa578 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:27 -0400 Subject: [PATCH 115/208] go get github.com/aws/aws-sdk-go-v2/service/groundstation. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5ec85a1d349..d16f62ff645 100644 --- a/go.mod +++ b/go.mod @@ -103,7 +103,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/fms v1.34.1 github.com/aws/aws-sdk-go-v2/service/glacier v1.23.1 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.1 - github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.0 + github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.1 github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.0 github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.0 github.com/aws/aws-sdk-go-v2/service/iam v1.33.0 diff --git a/go.sum b/go.sum index d5d1592b3e4..4971044b387 100644 --- a/go.sum +++ b/go.sum @@ -226,8 +226,8 @@ github.com/aws/aws-sdk-go-v2/service/glacier v1.23.1 h1:nUOHgAUOnQth5+fMWgCQiOEq github.com/aws/aws-sdk-go-v2/service/glacier v1.23.1/go.mod h1:29ythAZEVnLPIOCpzENgCzvZLoAHt8S8BHryPpm8EyI= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.1 h1:7C51ZbOLStv+VJwdiKGzJeKK0LPX6+XTJv199Q9xe0U= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.1/go.mod h1:VSQN6t3mMZfL/CEC2sg+MaSDv7A9sTFFhIB82k7zexA= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.0 h1:IrOlyBLb6XjB/iz0NoUSDjLCUYCHKKVxSrZUExb8tZ4= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.0/go.mod h1:gdMcdxtsqAvXMXqQpRmq8p06d7z6EAHb8mAP18K7duU= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.1 h1:XTtOVIG/v1yaff76zGqNLB9LDW/+hY7dQTuwvh4y5Qo= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.1/go.mod h1:GF6S/WXbeYIIdbsIAKsYdEvndnn8wksiolvsk27TaBo= github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.0 h1:1sIp9dUD3J7rPIHS9PvwJI7mIWtFP6e8RHy+RiUQZFo= github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.0/go.mod h1:tfSfErj83MbzhHCZiUT/h5Pgz6HTAn47ZdO00icaNnU= github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.0 h1:hmrbocHNj8wkYbVx2IQ6D2GMBfbbqZurALwI7O/gRCA= From 983826abf3f6dfc59d681de1c13675eb303df92d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:27 -0400 Subject: [PATCH 116/208] go get github.com/aws/aws-sdk-go-v2/service/guardduty. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d16f62ff645..df4654bc6f4 100644 --- a/go.mod +++ b/go.mod @@ -104,7 +104,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/glacier v1.23.1 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.1 github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.1 - github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.0 + github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.1 github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.0 github.com/aws/aws-sdk-go-v2/service/iam v1.33.0 github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.0 diff --git a/go.sum b/go.sum index 4971044b387..5636323d266 100644 --- a/go.sum +++ b/go.sum @@ -228,8 +228,8 @@ github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.1 h1:7C51ZbOLStv+VJ github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.1/go.mod h1:VSQN6t3mMZfL/CEC2sg+MaSDv7A9sTFFhIB82k7zexA= github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.1 h1:XTtOVIG/v1yaff76zGqNLB9LDW/+hY7dQTuwvh4y5Qo= github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.1/go.mod h1:GF6S/WXbeYIIdbsIAKsYdEvndnn8wksiolvsk27TaBo= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.0 h1:1sIp9dUD3J7rPIHS9PvwJI7mIWtFP6e8RHy+RiUQZFo= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.0/go.mod h1:tfSfErj83MbzhHCZiUT/h5Pgz6HTAn47ZdO00icaNnU= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.1 h1:0LOU9mO7AI2rjuuO9p8iymDR3jhY91d+P7XEjJkaa7w= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.1/go.mod h1:pqOGHA5mcb0tdNBQq7QjwhyXebpFvflQ2eU36zxgctM= github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.0 h1:hmrbocHNj8wkYbVx2IQ6D2GMBfbbqZurALwI7O/gRCA= github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.0/go.mod h1:3mevB7W93YhBpe7d4SW9jxiQdg5dlhL8U/r3sE1loU4= github.com/aws/aws-sdk-go-v2/service/iam v1.33.0 h1:p2xoaDPoghFBgtHndpM8//LauNkAU4/SXZn6HSfl4qM= From 21f3226d1ad6296e611965e14d257dddaaf6d440 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:28 -0400 Subject: [PATCH 117/208] go get github.com/aws/aws-sdk-go-v2/service/healthlake. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index df4654bc6f4..122a5ef09b3 100644 --- a/go.mod +++ b/go.mod @@ -105,7 +105,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.1 github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.1 github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.1 - github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.0 + github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.1 github.com/aws/aws-sdk-go-v2/service/iam v1.33.0 github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.0 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0 diff --git a/go.sum b/go.sum index 5636323d266..ff5a42d9286 100644 --- a/go.sum +++ b/go.sum @@ -230,8 +230,8 @@ github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.1 h1:XTtOVIG/v1yaff76zG github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.1/go.mod h1:GF6S/WXbeYIIdbsIAKsYdEvndnn8wksiolvsk27TaBo= github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.1 h1:0LOU9mO7AI2rjuuO9p8iymDR3jhY91d+P7XEjJkaa7w= github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.1/go.mod h1:pqOGHA5mcb0tdNBQq7QjwhyXebpFvflQ2eU36zxgctM= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.0 h1:hmrbocHNj8wkYbVx2IQ6D2GMBfbbqZurALwI7O/gRCA= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.0/go.mod h1:3mevB7W93YhBpe7d4SW9jxiQdg5dlhL8U/r3sE1loU4= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.1 h1:vehsCmdxi8vX7GK7ft1hlU0ZxTzbYnew192DukNngCQ= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.1/go.mod h1:WzKPsp14R9Vt2jhmMuZ79TMmmv/CnEVz3bI4eKRst7E= github.com/aws/aws-sdk-go-v2/service/iam v1.33.0 h1:p2xoaDPoghFBgtHndpM8//LauNkAU4/SXZn6HSfl4qM= github.com/aws/aws-sdk-go-v2/service/iam v1.33.0/go.mod h1:mycyYpCERRrn4zwk6/qOtnw5poVSrDb1pHY+RLPfIkA= github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.0 h1:qEAorzngBK3F06xk2s6tJRYJW8iCQM9YS0AA71ZQ9Ak= From b700e5eb034feeba425c6141cf9a9ee4428fb527 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:29 -0400 Subject: [PATCH 118/208] go get github.com/aws/aws-sdk-go-v2/service/iam. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 122a5ef09b3..29bb8e509d4 100644 --- a/go.mod +++ b/go.mod @@ -106,7 +106,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.1 github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.1 github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.1 - github.com/aws/aws-sdk-go-v2/service/iam v1.33.0 + github.com/aws/aws-sdk-go-v2/service/iam v1.33.1 github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.0 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.0 diff --git a/go.sum b/go.sum index ff5a42d9286..fea0eb0ef08 100644 --- a/go.sum +++ b/go.sum @@ -232,8 +232,8 @@ github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.1 h1:0LOU9mO7AI2rjuuO9p8iym github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.1/go.mod h1:pqOGHA5mcb0tdNBQq7QjwhyXebpFvflQ2eU36zxgctM= github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.1 h1:vehsCmdxi8vX7GK7ft1hlU0ZxTzbYnew192DukNngCQ= github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.1/go.mod h1:WzKPsp14R9Vt2jhmMuZ79TMmmv/CnEVz3bI4eKRst7E= -github.com/aws/aws-sdk-go-v2/service/iam v1.33.0 h1:p2xoaDPoghFBgtHndpM8//LauNkAU4/SXZn6HSfl4qM= -github.com/aws/aws-sdk-go-v2/service/iam v1.33.0/go.mod h1:mycyYpCERRrn4zwk6/qOtnw5poVSrDb1pHY+RLPfIkA= +github.com/aws/aws-sdk-go-v2/service/iam v1.33.1 h1:0dcMo3330L9LIckl+4iujMoq0AdR8LMK0TtgrjHUi6M= +github.com/aws/aws-sdk-go-v2/service/iam v1.33.1/go.mod h1:sX/naR5tYtlGFN0Bjg9VPNgYNg/rqiDUuKTW9peFnZk= github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.0 h1:qEAorzngBK3F06xk2s6tJRYJW8iCQM9YS0AA71ZQ9Ak= github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.0/go.mod h1:kO/aFGBHyBYc3iZZM/V6o1CX3KwmKL7dLOkptnVLz60= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0 h1:X6iYhpr/T3elhQ+Kvnx8Hyz+cZMtTWb7OPQc8OU5KtM= From 0aac4d9ca85a2ad4e17b05cf80973d864e7613e5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:30 -0400 Subject: [PATCH 119/208] go get github.com/aws/aws-sdk-go-v2/service/identitystore. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 29bb8e509d4..81b79d8b5fe 100644 --- a/go.mod +++ b/go.mod @@ -107,7 +107,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.1 github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.1 github.com/aws/aws-sdk-go-v2/service/iam v1.33.1 - github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.0 + github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.1 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.0 github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.0 diff --git a/go.sum b/go.sum index fea0eb0ef08..492504de3c0 100644 --- a/go.sum +++ b/go.sum @@ -234,8 +234,8 @@ github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.1 h1:vehsCmdxi8vX7GK7ft1hl github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.1/go.mod h1:WzKPsp14R9Vt2jhmMuZ79TMmmv/CnEVz3bI4eKRst7E= github.com/aws/aws-sdk-go-v2/service/iam v1.33.1 h1:0dcMo3330L9LIckl+4iujMoq0AdR8LMK0TtgrjHUi6M= github.com/aws/aws-sdk-go-v2/service/iam v1.33.1/go.mod h1:sX/naR5tYtlGFN0Bjg9VPNgYNg/rqiDUuKTW9peFnZk= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.0 h1:qEAorzngBK3F06xk2s6tJRYJW8iCQM9YS0AA71ZQ9Ak= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.0/go.mod h1:kO/aFGBHyBYc3iZZM/V6o1CX3KwmKL7dLOkptnVLz60= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.1 h1:g2WNVRtXDsxOA+VEMXXzw8gvXFdUrkXehiFsPFzSi9w= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.1/go.mod h1:XnTkN4iDJq8dN7VBZZDZ5NOEup8V3s/POj4uBlSy574= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0 h1:X6iYhpr/T3elhQ+Kvnx8Hyz+cZMtTWb7OPQc8OU5KtM= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0/go.mod h1:P3o/FYtRp9xLTWmIxZHgiZ7IMFc6naXeBeZANkms7DI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs= From 999d06e2bba398dd175d5b39be421892873b9f98 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:31 -0400 Subject: [PATCH 120/208] go get github.com/aws/aws-sdk-go-v2/service/inspector2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 81b79d8b5fe..af63b8135e6 100644 --- a/go.mod +++ b/go.mod @@ -108,7 +108,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.1 github.com/aws/aws-sdk-go-v2/service/iam v1.33.1 github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.1 - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0 + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.1 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.0 github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.0 github.com/aws/aws-sdk-go-v2/service/kafka v1.34.0 diff --git a/go.sum b/go.sum index 492504de3c0..2e70059a6d9 100644 --- a/go.sum +++ b/go.sum @@ -236,8 +236,8 @@ github.com/aws/aws-sdk-go-v2/service/iam v1.33.1 h1:0dcMo3330L9LIckl+4iujMoq0AdR github.com/aws/aws-sdk-go-v2/service/iam v1.33.1/go.mod h1:sX/naR5tYtlGFN0Bjg9VPNgYNg/rqiDUuKTW9peFnZk= github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.1 h1:g2WNVRtXDsxOA+VEMXXzw8gvXFdUrkXehiFsPFzSi9w= github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.1/go.mod h1:XnTkN4iDJq8dN7VBZZDZ5NOEup8V3s/POj4uBlSy574= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0 h1:X6iYhpr/T3elhQ+Kvnx8Hyz+cZMtTWb7OPQc8OU5KtM= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0/go.mod h1:P3o/FYtRp9xLTWmIxZHgiZ7IMFc6naXeBeZANkms7DI= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.1 h1:MrCy2Qee++yNI4t0adjhDrVi9xKhpPLiweIUy9HwJIc= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.1/go.mod h1:5FPrmv5Cwaq8Fri4puvds50dVPMgGZlU5inTlDs1UJQ= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.14 h1:oWccitSnByVU74rQRHac4gLfDqjB6Z1YQGOY/dXKedI= From d71cd64d23ca28bc92e9719a01d43305a026c9f8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:31 -0400 Subject: [PATCH 121/208] go get github.com/aws/aws-sdk-go-v2/service/internetmonitor. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index af63b8135e6..cbc7aba879d 100644 --- a/go.mod +++ b/go.mod @@ -109,7 +109,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/iam v1.33.1 github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.1 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.1 - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.0 + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.1 github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.0 github.com/aws/aws-sdk-go-v2/service/kafka v1.34.0 github.com/aws/aws-sdk-go-v2/service/kendra v1.51.0 diff --git a/go.sum b/go.sum index 2e70059a6d9..55ea608df7c 100644 --- a/go.sum +++ b/go.sum @@ -248,8 +248,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 h1:zSDPny/p github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14/go.mod h1:3TTcI5JSzda1nw/pkVC9dhgLre0SNBFj2lYS4GctXKI= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12 h1:tzha+v1SCEBpXWEuw6B/+jm4h5z8hZbTpXz0zRZqTnw= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12/go.mod h1:n+nt2qjHGoseWeLHt1vEr6ZRCCxIN2KcNpJxBcYQSwI= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.0 h1:qhosmDiiChXUik7EonQCa/Ar86wkN+RNJtrvw038FBc= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.0/go.mod h1:k4kMkKa2GC60pwx/7o9Lo1FafY/IweWPzEJDly2q5Q0= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.1 h1:xQv1YON3lQ/1YKM9LXQ1KYddz3xec93OSk0cPmY7BGE= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.1/go.mod h1:hZAlj3tvGG9afdu1J1fEuiAsGHL/nzYhzjlOFojJ2AM= github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.0 h1:tat1j8oYFZ3U+RjCPAsG2v/EeNA0tjNFFN/vejX7mYI= github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.0/go.mod h1:6d4tg8VqAxfgtTKzz2dJMvIWHrW+l0naowqFqVqxcjU= github.com/aws/aws-sdk-go-v2/service/kafka v1.34.0 h1:07HKBDj5blE+fyVtyf1WEihzADVfP9dsdt2b22VPAls= From 7e09f8d169f8e57f52bb243db988d451c6a36dd7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:32 -0400 Subject: [PATCH 122/208] go get github.com/aws/aws-sdk-go-v2/service/ivschat. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cbc7aba879d..fd00612f1ed 100644 --- a/go.mod +++ b/go.mod @@ -110,7 +110,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.1 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.1 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.1 - github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.0 + github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.1 github.com/aws/aws-sdk-go-v2/service/kafka v1.34.0 github.com/aws/aws-sdk-go-v2/service/kendra v1.51.0 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.0 diff --git a/go.sum b/go.sum index 55ea608df7c..82aae333842 100644 --- a/go.sum +++ b/go.sum @@ -250,8 +250,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12 h1:tzha+v1SCEBpX github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12/go.mod h1:n+nt2qjHGoseWeLHt1vEr6ZRCCxIN2KcNpJxBcYQSwI= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.1 h1:xQv1YON3lQ/1YKM9LXQ1KYddz3xec93OSk0cPmY7BGE= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.1/go.mod h1:hZAlj3tvGG9afdu1J1fEuiAsGHL/nzYhzjlOFojJ2AM= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.0 h1:tat1j8oYFZ3U+RjCPAsG2v/EeNA0tjNFFN/vejX7mYI= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.0/go.mod h1:6d4tg8VqAxfgtTKzz2dJMvIWHrW+l0naowqFqVqxcjU= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.1 h1:tUAfCwMmFEXX1i74o+BTvd2Xr0iU1eqnnJ/8jIr1lZs= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.1/go.mod h1:AJOtOziOUyo94xRigSdj1pjB8lrtegZTMiw4NkA2rqU= github.com/aws/aws-sdk-go-v2/service/kafka v1.34.0 h1:07HKBDj5blE+fyVtyf1WEihzADVfP9dsdt2b22VPAls= github.com/aws/aws-sdk-go-v2/service/kafka v1.34.0/go.mod h1:cFxsTlC46RM+GLxW922zvCPnV3p5ovUm3w/pG2iO+bU= github.com/aws/aws-sdk-go-v2/service/kendra v1.51.0 h1:I8uZn+5HgbBpggnM2RGbk3u6izgQbi/TyatI3HqkZiA= From 3b8ba86dab1b511d3bac8f9e9b4f3d852dd1c1f9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:33 -0400 Subject: [PATCH 123/208] go get github.com/aws/aws-sdk-go-v2/service/kafka. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fd00612f1ed..b7b1afe4a1c 100644 --- a/go.mod +++ b/go.mod @@ -111,7 +111,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.1 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.1 github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.1 - github.com/aws/aws-sdk-go-v2/service/kafka v1.34.0 + github.com/aws/aws-sdk-go-v2/service/kafka v1.34.1 github.com/aws/aws-sdk-go-v2/service/kendra v1.51.0 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.0 github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.0 diff --git a/go.sum b/go.sum index 82aae333842..85e43669d78 100644 --- a/go.sum +++ b/go.sum @@ -252,8 +252,8 @@ github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.1 h1:xQv1YON3lQ/1YKM9 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.1/go.mod h1:hZAlj3tvGG9afdu1J1fEuiAsGHL/nzYhzjlOFojJ2AM= github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.1 h1:tUAfCwMmFEXX1i74o+BTvd2Xr0iU1eqnnJ/8jIr1lZs= github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.1/go.mod h1:AJOtOziOUyo94xRigSdj1pjB8lrtegZTMiw4NkA2rqU= -github.com/aws/aws-sdk-go-v2/service/kafka v1.34.0 h1:07HKBDj5blE+fyVtyf1WEihzADVfP9dsdt2b22VPAls= -github.com/aws/aws-sdk-go-v2/service/kafka v1.34.0/go.mod h1:cFxsTlC46RM+GLxW922zvCPnV3p5ovUm3w/pG2iO+bU= +github.com/aws/aws-sdk-go-v2/service/kafka v1.34.1 h1:AgBv2EgMXguYPz1fpSyj51JuC6vXGNP0Wz3NNeHQLog= +github.com/aws/aws-sdk-go-v2/service/kafka v1.34.1/go.mod h1:/iV7HuLjhE4JD+xswkqjipO9tv7EPUbO+1QlaxB6BTA= github.com/aws/aws-sdk-go-v2/service/kendra v1.51.0 h1:I8uZn+5HgbBpggnM2RGbk3u6izgQbi/TyatI3HqkZiA= github.com/aws/aws-sdk-go-v2/service/kendra v1.51.0/go.mod h1:wiwrggxiDODtt1K/GizZ/rk6qZbdayC6nkvCT8Db+g4= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.0 h1:aVZsfw2eRODAto3hjFSJJhp89yQHt6pk254nkc9X4tI= From 6de42f9825afb0a3f2a57c24ee4415402b0799ff Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:34 -0400 Subject: [PATCH 124/208] go get github.com/aws/aws-sdk-go-v2/service/kendra. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b7b1afe4a1c..b67dece659a 100644 --- a/go.mod +++ b/go.mod @@ -112,7 +112,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.1 github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.1 github.com/aws/aws-sdk-go-v2/service/kafka v1.34.1 - github.com/aws/aws-sdk-go-v2/service/kendra v1.51.0 + github.com/aws/aws-sdk-go-v2/service/kendra v1.51.1 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.0 github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.0 github.com/aws/aws-sdk-go-v2/service/kms v1.34.0 diff --git a/go.sum b/go.sum index 85e43669d78..d2a770e187c 100644 --- a/go.sum +++ b/go.sum @@ -254,8 +254,8 @@ github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.1 h1:tUAfCwMmFEXX1i74o+BTvd2X github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.1/go.mod h1:AJOtOziOUyo94xRigSdj1pjB8lrtegZTMiw4NkA2rqU= github.com/aws/aws-sdk-go-v2/service/kafka v1.34.1 h1:AgBv2EgMXguYPz1fpSyj51JuC6vXGNP0Wz3NNeHQLog= github.com/aws/aws-sdk-go-v2/service/kafka v1.34.1/go.mod h1:/iV7HuLjhE4JD+xswkqjipO9tv7EPUbO+1QlaxB6BTA= -github.com/aws/aws-sdk-go-v2/service/kendra v1.51.0 h1:I8uZn+5HgbBpggnM2RGbk3u6izgQbi/TyatI3HqkZiA= -github.com/aws/aws-sdk-go-v2/service/kendra v1.51.0/go.mod h1:wiwrggxiDODtt1K/GizZ/rk6qZbdayC6nkvCT8Db+g4= +github.com/aws/aws-sdk-go-v2/service/kendra v1.51.1 h1:RfQPkqz555MsIkD0i0XIUQlj12QQ9ij+GI/NW9Pu3sw= +github.com/aws/aws-sdk-go-v2/service/kendra v1.51.1/go.mod h1:nwwYQj97ME0q/3Ak01ABehQiLqupYNI24pfxT9cIMuA= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.0 h1:aVZsfw2eRODAto3hjFSJJhp89yQHt6pk254nkc9X4tI= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.0/go.mod h1:hljEHeYMeOpHEAt8JfmTPBhgu1UECQR+LIKJohUS0fA= github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.0 h1:GlBz4i/73k7KGfgv2RV207nl5GgHEPqym/pZp/f5Oho= From e9c7058620c8e64c632051ca9e9061a91828c2e5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:34 -0400 Subject: [PATCH 125/208] go get github.com/aws/aws-sdk-go-v2/service/keyspaces. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b67dece659a..30feb88af86 100644 --- a/go.mod +++ b/go.mod @@ -113,7 +113,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.1 github.com/aws/aws-sdk-go-v2/service/kafka v1.34.1 github.com/aws/aws-sdk-go-v2/service/kendra v1.51.1 - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.0 + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.1 github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.0 github.com/aws/aws-sdk-go-v2/service/kms v1.34.0 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.0 diff --git a/go.sum b/go.sum index d2a770e187c..b340f4ce9af 100644 --- a/go.sum +++ b/go.sum @@ -256,8 +256,8 @@ github.com/aws/aws-sdk-go-v2/service/kafka v1.34.1 h1:AgBv2EgMXguYPz1fpSyj51JuC6 github.com/aws/aws-sdk-go-v2/service/kafka v1.34.1/go.mod h1:/iV7HuLjhE4JD+xswkqjipO9tv7EPUbO+1QlaxB6BTA= github.com/aws/aws-sdk-go-v2/service/kendra v1.51.1 h1:RfQPkqz555MsIkD0i0XIUQlj12QQ9ij+GI/NW9Pu3sw= github.com/aws/aws-sdk-go-v2/service/kendra v1.51.1/go.mod h1:nwwYQj97ME0q/3Ak01ABehQiLqupYNI24pfxT9cIMuA= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.0 h1:aVZsfw2eRODAto3hjFSJJhp89yQHt6pk254nkc9X4tI= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.0/go.mod h1:hljEHeYMeOpHEAt8JfmTPBhgu1UECQR+LIKJohUS0fA= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.1 h1:eMMWq0lgwP++zZVZ/K+W2Zx3fnbjUYFsDgFyXGus4ts= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.1/go.mod h1:zddI8paRYz+rwAu/0jBwGANi8rV3dk7Pcyj/trdu/N8= github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.0 h1:GlBz4i/73k7KGfgv2RV207nl5GgHEPqym/pZp/f5Oho= github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.0/go.mod h1:CgU0Lb1UkyogQXjSZ97CI4HRc3G0Ts1+ZTNFIPAfkHU= github.com/aws/aws-sdk-go-v2/service/kms v1.34.0 h1:GKrvkdgKYFjn5XMwzuuN+e9St/TnJwJl2rEisSfP6r8= From b949c6739d17f9a80f38f6d3f97262a98c1ebe7c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:35 -0400 Subject: [PATCH 126/208] go get github.com/aws/aws-sdk-go-v2/service/kinesis. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 30feb88af86..8dd40eb2808 100644 --- a/go.mod +++ b/go.mod @@ -114,7 +114,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kafka v1.34.1 github.com/aws/aws-sdk-go-v2/service/kendra v1.51.1 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.1 - github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.0 + github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.1 github.com/aws/aws-sdk-go-v2/service/kms v1.34.0 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.0 github.com/aws/aws-sdk-go-v2/service/lambda v1.55.0 diff --git a/go.sum b/go.sum index b340f4ce9af..49edec71516 100644 --- a/go.sum +++ b/go.sum @@ -258,8 +258,8 @@ github.com/aws/aws-sdk-go-v2/service/kendra v1.51.1 h1:RfQPkqz555MsIkD0i0XIUQlj1 github.com/aws/aws-sdk-go-v2/service/kendra v1.51.1/go.mod h1:nwwYQj97ME0q/3Ak01ABehQiLqupYNI24pfxT9cIMuA= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.1 h1:eMMWq0lgwP++zZVZ/K+W2Zx3fnbjUYFsDgFyXGus4ts= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.1/go.mod h1:zddI8paRYz+rwAu/0jBwGANi8rV3dk7Pcyj/trdu/N8= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.0 h1:GlBz4i/73k7KGfgv2RV207nl5GgHEPqym/pZp/f5Oho= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.0/go.mod h1:CgU0Lb1UkyogQXjSZ97CI4HRc3G0Ts1+ZTNFIPAfkHU= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.1 h1:kKV5YQgCYvyOHf2Fw7UZsXOiR4J82rS4uNhvNtk5YDA= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.1/go.mod h1:mCOLFKtbzhBey1ZcvC5Vd8bp7Lo40VCLJzDJjP6iGOY= github.com/aws/aws-sdk-go-v2/service/kms v1.34.0 h1:GKrvkdgKYFjn5XMwzuuN+e9St/TnJwJl2rEisSfP6r8= github.com/aws/aws-sdk-go-v2/service/kms v1.34.0/go.mod h1:AStnoP2Hj6IHB5nHbVw2mEiGjLpOJPxY+XOc2xcKTvU= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.0 h1:OwdIAzsPYUOCkkhCey8NDOJo+SIvfkIvyDeUhaN7cOE= From d9230fae469568fcc549a1beccdf8cab2a3f6516 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:36 -0400 Subject: [PATCH 127/208] go get github.com/aws/aws-sdk-go-v2/service/kms. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8dd40eb2808..b42b0d3f6c7 100644 --- a/go.mod +++ b/go.mod @@ -115,7 +115,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kendra v1.51.1 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.1 github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.1 - github.com/aws/aws-sdk-go-v2/service/kms v1.34.0 + github.com/aws/aws-sdk-go-v2/service/kms v1.34.1 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.0 github.com/aws/aws-sdk-go-v2/service/lambda v1.55.0 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.0 diff --git a/go.sum b/go.sum index 49edec71516..762a1393ada 100644 --- a/go.sum +++ b/go.sum @@ -260,8 +260,8 @@ github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.1 h1:eMMWq0lgwP++zZVZ/K+W2Z github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.1/go.mod h1:zddI8paRYz+rwAu/0jBwGANi8rV3dk7Pcyj/trdu/N8= github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.1 h1:kKV5YQgCYvyOHf2Fw7UZsXOiR4J82rS4uNhvNtk5YDA= github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.1/go.mod h1:mCOLFKtbzhBey1ZcvC5Vd8bp7Lo40VCLJzDJjP6iGOY= -github.com/aws/aws-sdk-go-v2/service/kms v1.34.0 h1:GKrvkdgKYFjn5XMwzuuN+e9St/TnJwJl2rEisSfP6r8= -github.com/aws/aws-sdk-go-v2/service/kms v1.34.0/go.mod h1:AStnoP2Hj6IHB5nHbVw2mEiGjLpOJPxY+XOc2xcKTvU= +github.com/aws/aws-sdk-go-v2/service/kms v1.34.1 h1:VsKBn6WADI3Nn3WjBMzeRww9WHXeVLi7zyuSrqjRCBQ= +github.com/aws/aws-sdk-go-v2/service/kms v1.34.1/go.mod h1:5F6kXrPBxv0l1t8EO44GuG4W82jGJwaRE0B+suEGnNY= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.0 h1:OwdIAzsPYUOCkkhCey8NDOJo+SIvfkIvyDeUhaN7cOE= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.0/go.mod h1:64y5I6zkuDp4//8B4gC0aMaigXFzuZnCMTXZmilApvY= github.com/aws/aws-sdk-go-v2/service/lambda v1.55.0 h1:vrwMgAOU8ZXrWs0QZOOAFRdWFNxoL2DdH4doD0BkmU4= From fb36bf437a7d69ba1b65be492bd2d433624ab06c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:37 -0400 Subject: [PATCH 128/208] go get github.com/aws/aws-sdk-go-v2/service/lakeformation. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b42b0d3f6c7..b9a10bdd2d9 100644 --- a/go.mod +++ b/go.mod @@ -116,7 +116,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.1 github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.1 github.com/aws/aws-sdk-go-v2/service/kms v1.34.1 - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.0 + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.1 github.com/aws/aws-sdk-go-v2/service/lambda v1.55.0 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.0 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.0 diff --git a/go.sum b/go.sum index 762a1393ada..9baf555b9c5 100644 --- a/go.sum +++ b/go.sum @@ -262,8 +262,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.1 h1:kKV5YQgCYvyOHf2Fw7UZsXOi github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.1/go.mod h1:mCOLFKtbzhBey1ZcvC5Vd8bp7Lo40VCLJzDJjP6iGOY= github.com/aws/aws-sdk-go-v2/service/kms v1.34.1 h1:VsKBn6WADI3Nn3WjBMzeRww9WHXeVLi7zyuSrqjRCBQ= github.com/aws/aws-sdk-go-v2/service/kms v1.34.1/go.mod h1:5F6kXrPBxv0l1t8EO44GuG4W82jGJwaRE0B+suEGnNY= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.0 h1:OwdIAzsPYUOCkkhCey8NDOJo+SIvfkIvyDeUhaN7cOE= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.0/go.mod h1:64y5I6zkuDp4//8B4gC0aMaigXFzuZnCMTXZmilApvY= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.1 h1:nQrZAsHVBVQRB7aJ6/f7a7u/DVaWu15HiWWJTEFJSpU= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.1/go.mod h1:vZzOCXUmJE5S2FgqCy7GOReT6b6riPfdS+wps2gwQlk= github.com/aws/aws-sdk-go-v2/service/lambda v1.55.0 h1:vrwMgAOU8ZXrWs0QZOOAFRdWFNxoL2DdH4doD0BkmU4= github.com/aws/aws-sdk-go-v2/service/lambda v1.55.0/go.mod h1:ZVT/r5NG5Fxjaw7rgDmOYVu0y2KELlQCcda/f+yypUQ= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.0 h1:KWPToB4PQaUswu9OYsizvFBhANLrjZQcgm+reIDIhAs= From cf9d0069a1424a4c6a0e6672b30b1fbed487bfd5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:37 -0400 Subject: [PATCH 129/208] go get github.com/aws/aws-sdk-go-v2/service/lambda. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b9a10bdd2d9..c654694e19c 100644 --- a/go.mod +++ b/go.mod @@ -117,7 +117,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.1 github.com/aws/aws-sdk-go-v2/service/kms v1.34.1 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.1 - github.com/aws/aws-sdk-go-v2/service/lambda v1.55.0 + github.com/aws/aws-sdk-go-v2/service/lambda v1.55.1 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.0 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.0 github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.0 diff --git a/go.sum b/go.sum index 9baf555b9c5..10708ebe578 100644 --- a/go.sum +++ b/go.sum @@ -264,8 +264,8 @@ github.com/aws/aws-sdk-go-v2/service/kms v1.34.1 h1:VsKBn6WADI3Nn3WjBMzeRww9WHXe github.com/aws/aws-sdk-go-v2/service/kms v1.34.1/go.mod h1:5F6kXrPBxv0l1t8EO44GuG4W82jGJwaRE0B+suEGnNY= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.1 h1:nQrZAsHVBVQRB7aJ6/f7a7u/DVaWu15HiWWJTEFJSpU= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.1/go.mod h1:vZzOCXUmJE5S2FgqCy7GOReT6b6riPfdS+wps2gwQlk= -github.com/aws/aws-sdk-go-v2/service/lambda v1.55.0 h1:vrwMgAOU8ZXrWs0QZOOAFRdWFNxoL2DdH4doD0BkmU4= -github.com/aws/aws-sdk-go-v2/service/lambda v1.55.0/go.mod h1:ZVT/r5NG5Fxjaw7rgDmOYVu0y2KELlQCcda/f+yypUQ= +github.com/aws/aws-sdk-go-v2/service/lambda v1.55.1 h1:Drh1jXr7mTcSXyjEgCIMijskUz/5FXgdjJcqXGQnjhs= +github.com/aws/aws-sdk-go-v2/service/lambda v1.55.1/go.mod h1:5drdANY67aOvUNJLjBEg2HXeCXkk0MDurqsJs73TXVQ= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.0 h1:KWPToB4PQaUswu9OYsizvFBhANLrjZQcgm+reIDIhAs= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.0/go.mod h1:POsVs9pgDb9GcDnU28jI0MYcJ8dmZXa69drFSWv9j/4= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.0 h1:aOjZLUohIyhQAa55T5YbADhbSD14shA3Uy9iFaMkLNA= From d7d7a3970cbba18ab2b6925e496b308cdb141983 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:38 -0400 Subject: [PATCH 130/208] go get github.com/aws/aws-sdk-go-v2/service/launchwizard. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c654694e19c..10a6bd03d9b 100644 --- a/go.mod +++ b/go.mod @@ -118,7 +118,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kms v1.34.1 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.1 github.com/aws/aws-sdk-go-v2/service/lambda v1.55.1 - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.0 + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.1 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.0 github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.0 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.0 diff --git a/go.sum b/go.sum index 10708ebe578..30f0cc724cf 100644 --- a/go.sum +++ b/go.sum @@ -266,8 +266,8 @@ github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.1 h1:nQrZAsHVBVQRB7aJ6/ github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.1/go.mod h1:vZzOCXUmJE5S2FgqCy7GOReT6b6riPfdS+wps2gwQlk= github.com/aws/aws-sdk-go-v2/service/lambda v1.55.1 h1:Drh1jXr7mTcSXyjEgCIMijskUz/5FXgdjJcqXGQnjhs= github.com/aws/aws-sdk-go-v2/service/lambda v1.55.1/go.mod h1:5drdANY67aOvUNJLjBEg2HXeCXkk0MDurqsJs73TXVQ= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.0 h1:KWPToB4PQaUswu9OYsizvFBhANLrjZQcgm+reIDIhAs= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.0/go.mod h1:POsVs9pgDb9GcDnU28jI0MYcJ8dmZXa69drFSWv9j/4= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.1 h1:SkoH8/0+c53BBHAsjoZXJoZy0EdmnOb4cUhMxn8BQR4= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.1/go.mod h1:2P/sUIiKxD3ohzL1CgjLDZnOksgIDUDffU7z54Ul1tA= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.0 h1:aOjZLUohIyhQAa55T5YbADhbSD14shA3Uy9iFaMkLNA= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.0/go.mod h1:o5ds6PGmBWFEalpuvHogbw/eWsTRVoWwSoKYPk8JQzY= github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.0 h1:nuwAO6+IALIMkohEh60AYmoMLyOHwRRB9jqmuA9Cu0M= From 3691ea77335f5ade711932ce9ef6fa60a0688c34 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:39 -0400 Subject: [PATCH 131/208] go get github.com/aws/aws-sdk-go-v2/service/lexmodelsv2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 10a6bd03d9b..2fd0be74274 100644 --- a/go.mod +++ b/go.mod @@ -119,7 +119,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.1 github.com/aws/aws-sdk-go-v2/service/lambda v1.55.1 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.1 - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.0 + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.1 github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.0 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.0 github.com/aws/aws-sdk-go-v2/service/m2 v1.14.0 diff --git a/go.sum b/go.sum index 30f0cc724cf..8a846043d8e 100644 --- a/go.sum +++ b/go.sum @@ -268,8 +268,8 @@ github.com/aws/aws-sdk-go-v2/service/lambda v1.55.1 h1:Drh1jXr7mTcSXyjEgCIMijskU github.com/aws/aws-sdk-go-v2/service/lambda v1.55.1/go.mod h1:5drdANY67aOvUNJLjBEg2HXeCXkk0MDurqsJs73TXVQ= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.1 h1:SkoH8/0+c53BBHAsjoZXJoZy0EdmnOb4cUhMxn8BQR4= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.1/go.mod h1:2P/sUIiKxD3ohzL1CgjLDZnOksgIDUDffU7z54Ul1tA= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.0 h1:aOjZLUohIyhQAa55T5YbADhbSD14shA3Uy9iFaMkLNA= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.0/go.mod h1:o5ds6PGmBWFEalpuvHogbw/eWsTRVoWwSoKYPk8JQzY= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.1 h1:pQuAnpqqsmBAALIN7W4sn06zV6Qv9PMbfeJ3imaGX4Y= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.1/go.mod h1:DACyUyjpYCDpjEE/3px9kWeIr8vC0SNyORyaSru35DQ= github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.0 h1:nuwAO6+IALIMkohEh60AYmoMLyOHwRRB9jqmuA9Cu0M= github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.0/go.mod h1:8ufD2bOz/z8yVDnlaHqy9ejN9UUzjwjSLxAwHkHoshI= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.0 h1:5xgnUWghApxJQjFglJ4YzHddQuhPh9SXJpLfI4TKRQM= From 796be79b374d3855f2fdce4c56343b7e72876ff8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:40 -0400 Subject: [PATCH 132/208] go get github.com/aws/aws-sdk-go-v2/service/lightsail. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2fd0be74274..be06de3c643 100644 --- a/go.mod +++ b/go.mod @@ -120,7 +120,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lambda v1.55.1 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.1 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.1 - github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.0 + github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.1 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.0 github.com/aws/aws-sdk-go-v2/service/m2 v1.14.0 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.0 diff --git a/go.sum b/go.sum index 8a846043d8e..9335e843f36 100644 --- a/go.sum +++ b/go.sum @@ -270,8 +270,8 @@ github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.1 h1:SkoH8/0+c53BBHAsjoZX github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.1/go.mod h1:2P/sUIiKxD3ohzL1CgjLDZnOksgIDUDffU7z54Ul1tA= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.1 h1:pQuAnpqqsmBAALIN7W4sn06zV6Qv9PMbfeJ3imaGX4Y= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.1/go.mod h1:DACyUyjpYCDpjEE/3px9kWeIr8vC0SNyORyaSru35DQ= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.0 h1:nuwAO6+IALIMkohEh60AYmoMLyOHwRRB9jqmuA9Cu0M= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.0/go.mod h1:8ufD2bOz/z8yVDnlaHqy9ejN9UUzjwjSLxAwHkHoshI= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.1 h1:OIdINTNLFOqm7t91ew7+CgcIkvDCCTuK4rBuREBAC2Q= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.1/go.mod h1:nP29+6YQpLvD/o/8SXaaSVFdRdPCpLLZv6MVAFiPqIQ= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.0 h1:5xgnUWghApxJQjFglJ4YzHddQuhPh9SXJpLfI4TKRQM= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.0/go.mod h1:b/iu0Uj2AdaFrGlaGX8/J3O5lmURNPaH5ogZZTr64gU= github.com/aws/aws-sdk-go-v2/service/m2 v1.14.0 h1:DFwW52UPdLPUqPx/lzSNM3U/E6NJJLlahyNh+x6AL1o= From d7909c7cd39f0d119227a397abc2998c94888564 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:41 -0400 Subject: [PATCH 133/208] go get github.com/aws/aws-sdk-go-v2/service/lookoutmetrics. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index be06de3c643..ea64e0baaba 100644 --- a/go.mod +++ b/go.mod @@ -121,7 +121,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.1 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.1 github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.1 - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.0 + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.1 github.com/aws/aws-sdk-go-v2/service/m2 v1.14.0 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.0 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.0 diff --git a/go.sum b/go.sum index 9335e843f36..9a7f5eb828c 100644 --- a/go.sum +++ b/go.sum @@ -272,8 +272,8 @@ github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.1 h1:pQuAnpqqsmBAALIN7W4s github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.1/go.mod h1:DACyUyjpYCDpjEE/3px9kWeIr8vC0SNyORyaSru35DQ= github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.1 h1:OIdINTNLFOqm7t91ew7+CgcIkvDCCTuK4rBuREBAC2Q= github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.1/go.mod h1:nP29+6YQpLvD/o/8SXaaSVFdRdPCpLLZv6MVAFiPqIQ= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.0 h1:5xgnUWghApxJQjFglJ4YzHddQuhPh9SXJpLfI4TKRQM= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.0/go.mod h1:b/iu0Uj2AdaFrGlaGX8/J3O5lmURNPaH5ogZZTr64gU= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.1 h1:ImufVLN7bEElrVC05pkpZqw6eYiHX6KFFO9iWqUEzhc= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.1/go.mod h1:Kbb0YMyrxzk1zlYncMv4/afaB0KvQWDiRFT9vuVpUGQ= github.com/aws/aws-sdk-go-v2/service/m2 v1.14.0 h1:DFwW52UPdLPUqPx/lzSNM3U/E6NJJLlahyNh+x6AL1o= github.com/aws/aws-sdk-go-v2/service/m2 v1.14.0/go.mod h1:V4zGgD3V7LsrsD8Ce+dkAw64+o86KjLa+fL75fxPly0= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.0 h1:A63CzSzHPkVkCFkpU56Da804IDNpay5TbiwRrryheHY= From 94ee41e9b86f1ab5d7326cdd27f83c06cdd00d62 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:42 -0400 Subject: [PATCH 134/208] go get github.com/aws/aws-sdk-go-v2/service/m2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ea64e0baaba..5cfc2e37690 100644 --- a/go.mod +++ b/go.mod @@ -122,7 +122,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.1 github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.1 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.1 - github.com/aws/aws-sdk-go-v2/service/m2 v1.14.0 + github.com/aws/aws-sdk-go-v2/service/m2 v1.14.1 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.0 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.0 github.com/aws/aws-sdk-go-v2/service/medialive v1.53.0 diff --git a/go.sum b/go.sum index 9a7f5eb828c..813373e9e7c 100644 --- a/go.sum +++ b/go.sum @@ -274,8 +274,8 @@ github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.1 h1:OIdINTNLFOqm7t91ew7+Cg github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.1/go.mod h1:nP29+6YQpLvD/o/8SXaaSVFdRdPCpLLZv6MVAFiPqIQ= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.1 h1:ImufVLN7bEElrVC05pkpZqw6eYiHX6KFFO9iWqUEzhc= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.1/go.mod h1:Kbb0YMyrxzk1zlYncMv4/afaB0KvQWDiRFT9vuVpUGQ= -github.com/aws/aws-sdk-go-v2/service/m2 v1.14.0 h1:DFwW52UPdLPUqPx/lzSNM3U/E6NJJLlahyNh+x6AL1o= -github.com/aws/aws-sdk-go-v2/service/m2 v1.14.0/go.mod h1:V4zGgD3V7LsrsD8Ce+dkAw64+o86KjLa+fL75fxPly0= +github.com/aws/aws-sdk-go-v2/service/m2 v1.14.1 h1:oOStgQy7APtRye8/QWEKaY+rL1xASmFYJtPjjYtIHMs= +github.com/aws/aws-sdk-go-v2/service/m2 v1.14.1/go.mod h1:YxWYSbAEqBGH03gk0jcobKzW6Kq0yd2N08PdoxEsgTg= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.0 h1:A63CzSzHPkVkCFkpU56Da804IDNpay5TbiwRrryheHY= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.0/go.mod h1:HlbpoiCoiec/aSqe19eep/AWYHDOwDg1zBSeBpgfPLo= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.0 h1:Xah+rTdeRrUzz+/bxMp8fTjwGdgxv/kek7myjnkBkAQ= From 439b596b54c6722db3e75d9c3c273d2d33cdb649 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:42 -0400 Subject: [PATCH 135/208] go get github.com/aws/aws-sdk-go-v2/service/mediaconnect. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5cfc2e37690..05626f0728f 100644 --- a/go.mod +++ b/go.mod @@ -123,7 +123,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.1 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.1 github.com/aws/aws-sdk-go-v2/service/m2 v1.14.1 - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.0 + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.1 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.0 github.com/aws/aws-sdk-go-v2/service/medialive v1.53.0 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.0 diff --git a/go.sum b/go.sum index 813373e9e7c..7c025af4ac0 100644 --- a/go.sum +++ b/go.sum @@ -276,8 +276,8 @@ github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.1 h1:ImufVLN7bEElrVC05 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.1/go.mod h1:Kbb0YMyrxzk1zlYncMv4/afaB0KvQWDiRFT9vuVpUGQ= github.com/aws/aws-sdk-go-v2/service/m2 v1.14.1 h1:oOStgQy7APtRye8/QWEKaY+rL1xASmFYJtPjjYtIHMs= github.com/aws/aws-sdk-go-v2/service/m2 v1.14.1/go.mod h1:YxWYSbAEqBGH03gk0jcobKzW6Kq0yd2N08PdoxEsgTg= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.0 h1:A63CzSzHPkVkCFkpU56Da804IDNpay5TbiwRrryheHY= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.0/go.mod h1:HlbpoiCoiec/aSqe19eep/AWYHDOwDg1zBSeBpgfPLo= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.1 h1:6tFXjY3Lz997P+k0zHVoSRxJdkzTOc8Ns2RRtGeFKg4= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.1/go.mod h1:s7Som/VmhvLO1c2ODsd6VelNFoDvzy0ZpWAcVmnLTnE= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.0 h1:Xah+rTdeRrUzz+/bxMp8fTjwGdgxv/kek7myjnkBkAQ= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.0/go.mod h1:8zjF2Dt1bDZJGqfLtqoRMllSkfyiHaanYvkVP7XW4Pk= github.com/aws/aws-sdk-go-v2/service/medialive v1.53.0 h1:TrESOVo6H5c7ZtjKp1Vf7hfL0UqmqmRJYiIbqfwT9lw= From 15d3a87bbd6d211faf2429f55cfddfa91bb8b503 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:43 -0400 Subject: [PATCH 136/208] go get github.com/aws/aws-sdk-go-v2/service/mediaconvert. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 05626f0728f..56c40d556db 100644 --- a/go.mod +++ b/go.mod @@ -124,7 +124,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.1 github.com/aws/aws-sdk-go-v2/service/m2 v1.14.1 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.1 - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.0 + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.1 github.com/aws/aws-sdk-go-v2/service/medialive v1.53.0 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.0 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.0 diff --git a/go.sum b/go.sum index 7c025af4ac0..fc04079cf63 100644 --- a/go.sum +++ b/go.sum @@ -278,8 +278,8 @@ github.com/aws/aws-sdk-go-v2/service/m2 v1.14.1 h1:oOStgQy7APtRye8/QWEKaY+rL1xAS github.com/aws/aws-sdk-go-v2/service/m2 v1.14.1/go.mod h1:YxWYSbAEqBGH03gk0jcobKzW6Kq0yd2N08PdoxEsgTg= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.1 h1:6tFXjY3Lz997P+k0zHVoSRxJdkzTOc8Ns2RRtGeFKg4= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.1/go.mod h1:s7Som/VmhvLO1c2ODsd6VelNFoDvzy0ZpWAcVmnLTnE= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.0 h1:Xah+rTdeRrUzz+/bxMp8fTjwGdgxv/kek7myjnkBkAQ= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.0/go.mod h1:8zjF2Dt1bDZJGqfLtqoRMllSkfyiHaanYvkVP7XW4Pk= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.1 h1:Ipwvv5Mot7I/ofXBNsM05LUZfEHKWrdqFH6EaVrom2U= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.1/go.mod h1:cf2y51+iaui3t0evj14KJibqFP4kMqFuNRIa9huKEsw= github.com/aws/aws-sdk-go-v2/service/medialive v1.53.0 h1:TrESOVo6H5c7ZtjKp1Vf7hfL0UqmqmRJYiIbqfwT9lw= github.com/aws/aws-sdk-go-v2/service/medialive v1.53.0/go.mod h1:Nw5GLwYZvqZ6dV/jbnzsObMzpy8/Wk+9LvABHWtZoZM= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.0 h1:hnshAIgbRHjGKVnhp+k6lBHhBgkW/z8dy3HkLnjgzeg= From 0936015cd6ae001917f0094f7b7db82eb3ce0476 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:44 -0400 Subject: [PATCH 137/208] go get github.com/aws/aws-sdk-go-v2/service/medialive. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 56c40d556db..64bcf3dd63e 100644 --- a/go.mod +++ b/go.mod @@ -125,7 +125,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/m2 v1.14.1 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.1 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.1 - github.com/aws/aws-sdk-go-v2/service/medialive v1.53.0 + github.com/aws/aws-sdk-go-v2/service/medialive v1.53.1 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.0 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.0 github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.0 diff --git a/go.sum b/go.sum index fc04079cf63..8001ba670df 100644 --- a/go.sum +++ b/go.sum @@ -280,8 +280,8 @@ github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.1 h1:6tFXjY3Lz997P+k0zHV github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.1/go.mod h1:s7Som/VmhvLO1c2ODsd6VelNFoDvzy0ZpWAcVmnLTnE= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.1 h1:Ipwvv5Mot7I/ofXBNsM05LUZfEHKWrdqFH6EaVrom2U= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.1/go.mod h1:cf2y51+iaui3t0evj14KJibqFP4kMqFuNRIa9huKEsw= -github.com/aws/aws-sdk-go-v2/service/medialive v1.53.0 h1:TrESOVo6H5c7ZtjKp1Vf7hfL0UqmqmRJYiIbqfwT9lw= -github.com/aws/aws-sdk-go-v2/service/medialive v1.53.0/go.mod h1:Nw5GLwYZvqZ6dV/jbnzsObMzpy8/Wk+9LvABHWtZoZM= +github.com/aws/aws-sdk-go-v2/service/medialive v1.53.1 h1:z/OtXeoNPytEQXEklZ/79rM5dLRtFaqwri/9vCItY2Y= +github.com/aws/aws-sdk-go-v2/service/medialive v1.53.1/go.mod h1:NVacuK6xVc9bKwz4CsVcD20aY7F9Y9BZ4WG0TFZimhg= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.0 h1:hnshAIgbRHjGKVnhp+k6lBHhBgkW/z8dy3HkLnjgzeg= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.0/go.mod h1:KjnRZNMI89hQn1kvHJAKW6ZiiSfb8eCFMAK1RmEhU+U= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.0 h1:fp+EzoLjY/IEyNI+pvHyn/P7EP7ReUXvhVxtNGkHArY= From d4c471ce095d958cb02a8cb36ecb3c7808a43801 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:45 -0400 Subject: [PATCH 138/208] go get github.com/aws/aws-sdk-go-v2/service/mediapackage. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 64bcf3dd63e..df81ffa6618 100644 --- a/go.mod +++ b/go.mod @@ -126,7 +126,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.1 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.1 github.com/aws/aws-sdk-go-v2/service/medialive v1.53.1 - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.0 + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.1 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.0 github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.0 github.com/aws/aws-sdk-go-v2/service/mq v1.23.0 diff --git a/go.sum b/go.sum index 8001ba670df..ebcd9c48b7a 100644 --- a/go.sum +++ b/go.sum @@ -282,8 +282,8 @@ github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.1 h1:Ipwvv5Mot7I/ofXBNsM github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.1/go.mod h1:cf2y51+iaui3t0evj14KJibqFP4kMqFuNRIa9huKEsw= github.com/aws/aws-sdk-go-v2/service/medialive v1.53.1 h1:z/OtXeoNPytEQXEklZ/79rM5dLRtFaqwri/9vCItY2Y= github.com/aws/aws-sdk-go-v2/service/medialive v1.53.1/go.mod h1:NVacuK6xVc9bKwz4CsVcD20aY7F9Y9BZ4WG0TFZimhg= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.0 h1:hnshAIgbRHjGKVnhp+k6lBHhBgkW/z8dy3HkLnjgzeg= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.0/go.mod h1:KjnRZNMI89hQn1kvHJAKW6ZiiSfb8eCFMAK1RmEhU+U= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.1 h1:qpO+Oc7bKrc7+fvU5O7sFnB4s0CND/6Fv8M7yvMal08= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.1/go.mod h1:kfUZB7t0Yqho3G49zepbeCFSQgTnUTHuyMGCOu8RQOc= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.0 h1:fp+EzoLjY/IEyNI+pvHyn/P7EP7ReUXvhVxtNGkHArY= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.0/go.mod h1:GP1Y0gWRh63ZrCgNTep18xMtfJ+UxvQh3ySWeP6dwTI= github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.0 h1:v8U8FO3M2QjA7yTgC9oyD64A6I6h9AJfApgTB2xvQmg= From 6a85b9b85a735c9731fdae7a487c24ab64652bb4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:46 -0400 Subject: [PATCH 139/208] go get github.com/aws/aws-sdk-go-v2/service/mediapackagev2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index df81ffa6618..c6eda7660aa 100644 --- a/go.mod +++ b/go.mod @@ -127,7 +127,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.1 github.com/aws/aws-sdk-go-v2/service/medialive v1.53.1 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.1 - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.0 + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.1 github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.0 github.com/aws/aws-sdk-go-v2/service/mq v1.23.0 github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.0 diff --git a/go.sum b/go.sum index ebcd9c48b7a..8e0cf8399b4 100644 --- a/go.sum +++ b/go.sum @@ -284,8 +284,8 @@ github.com/aws/aws-sdk-go-v2/service/medialive v1.53.1 h1:z/OtXeoNPytEQXEklZ/79r github.com/aws/aws-sdk-go-v2/service/medialive v1.53.1/go.mod h1:NVacuK6xVc9bKwz4CsVcD20aY7F9Y9BZ4WG0TFZimhg= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.1 h1:qpO+Oc7bKrc7+fvU5O7sFnB4s0CND/6Fv8M7yvMal08= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.1/go.mod h1:kfUZB7t0Yqho3G49zepbeCFSQgTnUTHuyMGCOu8RQOc= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.0 h1:fp+EzoLjY/IEyNI+pvHyn/P7EP7ReUXvhVxtNGkHArY= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.0/go.mod h1:GP1Y0gWRh63ZrCgNTep18xMtfJ+UxvQh3ySWeP6dwTI= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.1 h1:avU2E/Yu+4SrcV9Nb7M4ifdjGiXRR7nJx4FvfO3YL4M= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.1/go.mod h1:v83XUctBgyBJnYoHykOj3YsRNnzK8LlHGyS5HJoBIzU= github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.0 h1:v8U8FO3M2QjA7yTgC9oyD64A6I6h9AJfApgTB2xvQmg= github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.0/go.mod h1:Zm+Mm7zDSLiJMmrQAckI0LS+u5k/isK4wHM0MCbexYk= github.com/aws/aws-sdk-go-v2/service/mq v1.23.0 h1:7PvX/V1CmtXt/gvQwBl2yM4bbw2ERLZGXmotTAacdpY= From 20202bcde3269ea4111ad514c20ff37c4ac8547b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:47 -0400 Subject: [PATCH 140/208] go get github.com/aws/aws-sdk-go-v2/service/mediastore. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c6eda7660aa..46289967c78 100644 --- a/go.mod +++ b/go.mod @@ -128,7 +128,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/medialive v1.53.1 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.1 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.1 - github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.0 + github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.1 github.com/aws/aws-sdk-go-v2/service/mq v1.23.0 github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.0 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.0 diff --git a/go.sum b/go.sum index 8e0cf8399b4..517a3c10c90 100644 --- a/go.sum +++ b/go.sum @@ -286,8 +286,8 @@ github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.1 h1:qpO+Oc7bKrc7+fvU5O7 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.1/go.mod h1:kfUZB7t0Yqho3G49zepbeCFSQgTnUTHuyMGCOu8RQOc= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.1 h1:avU2E/Yu+4SrcV9Nb7M4ifdjGiXRR7nJx4FvfO3YL4M= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.1/go.mod h1:v83XUctBgyBJnYoHykOj3YsRNnzK8LlHGyS5HJoBIzU= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.0 h1:v8U8FO3M2QjA7yTgC9oyD64A6I6h9AJfApgTB2xvQmg= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.0/go.mod h1:Zm+Mm7zDSLiJMmrQAckI0LS+u5k/isK4wHM0MCbexYk= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.1 h1:SU4k8WNXxRUQgmAmtiwHJTsJiPLZ1ItN93vef2+D5KM= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.1/go.mod h1:z1b7kZLDuNTSrUbA/mDLaRJ2ivlTjqr0H4aoBx6x7PU= github.com/aws/aws-sdk-go-v2/service/mq v1.23.0 h1:7PvX/V1CmtXt/gvQwBl2yM4bbw2ERLZGXmotTAacdpY= github.com/aws/aws-sdk-go-v2/service/mq v1.23.0/go.mod h1:s6bdv+6LzsWAQCi2Xu+WEi74KpyAT65pwbdGIub4LvU= github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.0 h1:bKi7qpSkeRbkpWHCwlAgMMXnwYu4JqfzyWmob0N9tbI= From a4006ae95b3338ab697331f0778e2447bad822a2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:47 -0400 Subject: [PATCH 141/208] go get github.com/aws/aws-sdk-go-v2/service/mq. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 46289967c78..a8e4cc3c8fd 100644 --- a/go.mod +++ b/go.mod @@ -129,7 +129,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.1 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.1 github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.1 - github.com/aws/aws-sdk-go-v2/service/mq v1.23.0 + github.com/aws/aws-sdk-go-v2/service/mq v1.23.1 github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.0 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.0 github.com/aws/aws-sdk-go-v2/service/oam v1.12.0 diff --git a/go.sum b/go.sum index 517a3c10c90..43abc5a4be9 100644 --- a/go.sum +++ b/go.sum @@ -288,8 +288,8 @@ github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.1 h1:avU2E/Yu+4SrcV9Nb github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.1/go.mod h1:v83XUctBgyBJnYoHykOj3YsRNnzK8LlHGyS5HJoBIzU= github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.1 h1:SU4k8WNXxRUQgmAmtiwHJTsJiPLZ1ItN93vef2+D5KM= github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.1/go.mod h1:z1b7kZLDuNTSrUbA/mDLaRJ2ivlTjqr0H4aoBx6x7PU= -github.com/aws/aws-sdk-go-v2/service/mq v1.23.0 h1:7PvX/V1CmtXt/gvQwBl2yM4bbw2ERLZGXmotTAacdpY= -github.com/aws/aws-sdk-go-v2/service/mq v1.23.0/go.mod h1:s6bdv+6LzsWAQCi2Xu+WEi74KpyAT65pwbdGIub4LvU= +github.com/aws/aws-sdk-go-v2/service/mq v1.23.1 h1:TcIIYgAH1voIS33mcUFIdts9qJ4+mzGbnHExAzmjNPM= +github.com/aws/aws-sdk-go-v2/service/mq v1.23.1/go.mod h1:qo6k2hLt3/Oi0fTndXhdMCg005TzoqT313YrYMorrNI= github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.0 h1:bKi7qpSkeRbkpWHCwlAgMMXnwYu4JqfzyWmob0N9tbI= github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.0/go.mod h1:6i04FP47GX97vfirLHyRGHyzDHsDyhz0m+wIEv/DfeM= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.0 h1:6c6bLYsKD2/IhHDlbQKC6LfsHbN1olRDdBPJdwCAKlE= From b401aae2bcde893864222731e32136fb192902fb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:48 -0400 Subject: [PATCH 142/208] go get github.com/aws/aws-sdk-go-v2/service/mwaa. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a8e4cc3c8fd..f98879ed4dc 100644 --- a/go.mod +++ b/go.mod @@ -130,7 +130,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.1 github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.1 github.com/aws/aws-sdk-go-v2/service/mq v1.23.1 - github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.0 + github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.1 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.0 github.com/aws/aws-sdk-go-v2/service/oam v1.12.0 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.0 diff --git a/go.sum b/go.sum index 43abc5a4be9..de217bde1e8 100644 --- a/go.sum +++ b/go.sum @@ -290,8 +290,8 @@ github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.1 h1:SU4k8WNXxRUQgmAmtiwHJ github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.1/go.mod h1:z1b7kZLDuNTSrUbA/mDLaRJ2ivlTjqr0H4aoBx6x7PU= github.com/aws/aws-sdk-go-v2/service/mq v1.23.1 h1:TcIIYgAH1voIS33mcUFIdts9qJ4+mzGbnHExAzmjNPM= github.com/aws/aws-sdk-go-v2/service/mq v1.23.1/go.mod h1:qo6k2hLt3/Oi0fTndXhdMCg005TzoqT313YrYMorrNI= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.0 h1:bKi7qpSkeRbkpWHCwlAgMMXnwYu4JqfzyWmob0N9tbI= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.0/go.mod h1:6i04FP47GX97vfirLHyRGHyzDHsDyhz0m+wIEv/DfeM= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.1 h1:fzBc0gfOfrlcyP/COVDt8iGVUnQ4FX/qaasEAUeDLy0= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.1/go.mod h1:a46hMp6jog7U6rhMxmp0wwcGvPTJINQkc6EevZb7SNs= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.0 h1:6c6bLYsKD2/IhHDlbQKC6LfsHbN1olRDdBPJdwCAKlE= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.0/go.mod h1:hRUpppMdU4Ez82Bv44GhZ0lgwWjbqoxk4rlj+MoIIFk= github.com/aws/aws-sdk-go-v2/service/oam v1.12.0 h1:NyYwBx/auaIYoPvHUPHUpE4p5jzaFqhL1qmxfk9+HhA= From e317e078e363798bd1a572dcda37d46562ee04f7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:49 -0400 Subject: [PATCH 143/208] go get github.com/aws/aws-sdk-go-v2/service/neptunegraph. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f98879ed4dc..91dae0678bd 100644 --- a/go.mod +++ b/go.mod @@ -131,7 +131,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.1 github.com/aws/aws-sdk-go-v2/service/mq v1.23.1 github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.1 - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.0 + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.1 github.com/aws/aws-sdk-go-v2/service/oam v1.12.0 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.0 github.com/aws/aws-sdk-go-v2/service/organizations v1.28.0 diff --git a/go.sum b/go.sum index de217bde1e8..e25286db917 100644 --- a/go.sum +++ b/go.sum @@ -292,8 +292,8 @@ github.com/aws/aws-sdk-go-v2/service/mq v1.23.1 h1:TcIIYgAH1voIS33mcUFIdts9qJ4+m github.com/aws/aws-sdk-go-v2/service/mq v1.23.1/go.mod h1:qo6k2hLt3/Oi0fTndXhdMCg005TzoqT313YrYMorrNI= github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.1 h1:fzBc0gfOfrlcyP/COVDt8iGVUnQ4FX/qaasEAUeDLy0= github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.1/go.mod h1:a46hMp6jog7U6rhMxmp0wwcGvPTJINQkc6EevZb7SNs= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.0 h1:6c6bLYsKD2/IhHDlbQKC6LfsHbN1olRDdBPJdwCAKlE= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.0/go.mod h1:hRUpppMdU4Ez82Bv44GhZ0lgwWjbqoxk4rlj+MoIIFk= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.1 h1:UjByGYRBlhjY4l8Lun62K3Z62Wks84q3UasnDDJoz5I= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.1/go.mod h1:5q3YTQennpO1/KB7rU71vW/9PjLC4PuosEi2xDEw5OY= github.com/aws/aws-sdk-go-v2/service/oam v1.12.0 h1:NyYwBx/auaIYoPvHUPHUpE4p5jzaFqhL1qmxfk9+HhA= github.com/aws/aws-sdk-go-v2/service/oam v1.12.0/go.mod h1:QmR858iis15nB1JSbLooR6zK+ZC3zZfwW9bDdv/taAM= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.0 h1:K7v/cjRbKXWy4qJDtrZ9D+N7Bcv1YYgiV0u8p8a++jc= From 477418b3bad7e2db9820b4b8239ba3cadb69884c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:50 -0400 Subject: [PATCH 144/208] go get github.com/aws/aws-sdk-go-v2/service/oam. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 91dae0678bd..065ffa40534 100644 --- a/go.mod +++ b/go.mod @@ -132,7 +132,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mq v1.23.1 github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.1 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.1 - github.com/aws/aws-sdk-go-v2/service/oam v1.12.0 + github.com/aws/aws-sdk-go-v2/service/oam v1.12.1 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.0 github.com/aws/aws-sdk-go-v2/service/organizations v1.28.0 github.com/aws/aws-sdk-go-v2/service/osis v1.11.0 diff --git a/go.sum b/go.sum index e25286db917..c7e0cb6bb9c 100644 --- a/go.sum +++ b/go.sum @@ -294,8 +294,8 @@ github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.1 h1:fzBc0gfOfrlcyP/COVDt8iGVUnQ github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.1/go.mod h1:a46hMp6jog7U6rhMxmp0wwcGvPTJINQkc6EevZb7SNs= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.1 h1:UjByGYRBlhjY4l8Lun62K3Z62Wks84q3UasnDDJoz5I= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.1/go.mod h1:5q3YTQennpO1/KB7rU71vW/9PjLC4PuosEi2xDEw5OY= -github.com/aws/aws-sdk-go-v2/service/oam v1.12.0 h1:NyYwBx/auaIYoPvHUPHUpE4p5jzaFqhL1qmxfk9+HhA= -github.com/aws/aws-sdk-go-v2/service/oam v1.12.0/go.mod h1:QmR858iis15nB1JSbLooR6zK+ZC3zZfwW9bDdv/taAM= +github.com/aws/aws-sdk-go-v2/service/oam v1.12.1 h1:LZrULRkfrmZVE8OHqwI8tKFEFxpjZl6ll7Bn2MCCVwg= +github.com/aws/aws-sdk-go-v2/service/oam v1.12.1/go.mod h1:yiUaEYA1zVxtz/EGgf8NE7rT56sLKGqQwQrWg/GhGu8= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.0 h1:K7v/cjRbKXWy4qJDtrZ9D+N7Bcv1YYgiV0u8p8a++jc= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.0/go.mod h1:BUJisSmzHH8bDzBUuS8oibm+tTkabL1edIok+oaXwrA= github.com/aws/aws-sdk-go-v2/service/organizations v1.28.0 h1:tm2U9o4/Pj6Sj1WYshqyTr3eF0sZviLn/UIElhyeBTA= From af38cca4a75f21ed07e265e3bb3c9e0252dda065 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:51 -0400 Subject: [PATCH 145/208] go get github.com/aws/aws-sdk-go-v2/service/opensearchserverless. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 065ffa40534..235960ff984 100644 --- a/go.mod +++ b/go.mod @@ -133,7 +133,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.1 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.1 github.com/aws/aws-sdk-go-v2/service/oam v1.12.1 - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.0 + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.1 github.com/aws/aws-sdk-go-v2/service/organizations v1.28.0 github.com/aws/aws-sdk-go-v2/service/osis v1.11.0 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.0 diff --git a/go.sum b/go.sum index c7e0cb6bb9c..113450d126e 100644 --- a/go.sum +++ b/go.sum @@ -296,8 +296,8 @@ github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.1 h1:UjByGYRBlhjY4l8Lun62 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.1/go.mod h1:5q3YTQennpO1/KB7rU71vW/9PjLC4PuosEi2xDEw5OY= github.com/aws/aws-sdk-go-v2/service/oam v1.12.1 h1:LZrULRkfrmZVE8OHqwI8tKFEFxpjZl6ll7Bn2MCCVwg= github.com/aws/aws-sdk-go-v2/service/oam v1.12.1/go.mod h1:yiUaEYA1zVxtz/EGgf8NE7rT56sLKGqQwQrWg/GhGu8= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.0 h1:K7v/cjRbKXWy4qJDtrZ9D+N7Bcv1YYgiV0u8p8a++jc= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.0/go.mod h1:BUJisSmzHH8bDzBUuS8oibm+tTkabL1edIok+oaXwrA= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.1 h1:BRAM7tTwHJojSOhiyUkPh2Z/hOco7OkayTf6MYFOF5w= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.1/go.mod h1:JhHI5YxjlRL5IqQPcijTGs8e7B0mVLLk1fpssVqjZaY= github.com/aws/aws-sdk-go-v2/service/organizations v1.28.0 h1:tm2U9o4/Pj6Sj1WYshqyTr3eF0sZviLn/UIElhyeBTA= github.com/aws/aws-sdk-go-v2/service/organizations v1.28.0/go.mod h1:gsyCAmtG8IgmzfqBQiduGEOhBrIVAZsGv7S4rCvXFRM= github.com/aws/aws-sdk-go-v2/service/osis v1.11.0 h1:DO6ZBGQ1e8dkEO/dyFBfCfA3EyhYvUpVSsNNvZ1WlGc= From 43e82716687e5f9feff83fa22260549885003b62 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:52 -0400 Subject: [PATCH 146/208] go get github.com/aws/aws-sdk-go-v2/service/organizations. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 235960ff984..49642fa49cd 100644 --- a/go.mod +++ b/go.mod @@ -134,7 +134,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.1 github.com/aws/aws-sdk-go-v2/service/oam v1.12.1 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.1 - github.com/aws/aws-sdk-go-v2/service/organizations v1.28.0 + github.com/aws/aws-sdk-go-v2/service/organizations v1.28.1 github.com/aws/aws-sdk-go-v2/service/osis v1.11.0 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.0 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.0 diff --git a/go.sum b/go.sum index 113450d126e..5e6faf689e1 100644 --- a/go.sum +++ b/go.sum @@ -298,8 +298,8 @@ github.com/aws/aws-sdk-go-v2/service/oam v1.12.1 h1:LZrULRkfrmZVE8OHqwI8tKFEFxpj github.com/aws/aws-sdk-go-v2/service/oam v1.12.1/go.mod h1:yiUaEYA1zVxtz/EGgf8NE7rT56sLKGqQwQrWg/GhGu8= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.1 h1:BRAM7tTwHJojSOhiyUkPh2Z/hOco7OkayTf6MYFOF5w= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.1/go.mod h1:JhHI5YxjlRL5IqQPcijTGs8e7B0mVLLk1fpssVqjZaY= -github.com/aws/aws-sdk-go-v2/service/organizations v1.28.0 h1:tm2U9o4/Pj6Sj1WYshqyTr3eF0sZviLn/UIElhyeBTA= -github.com/aws/aws-sdk-go-v2/service/organizations v1.28.0/go.mod h1:gsyCAmtG8IgmzfqBQiduGEOhBrIVAZsGv7S4rCvXFRM= +github.com/aws/aws-sdk-go-v2/service/organizations v1.28.1 h1:dfjBY/IdKIGBvE46uNHYFW9csLGt683je80+fAFiLmw= +github.com/aws/aws-sdk-go-v2/service/organizations v1.28.1/go.mod h1:asny2SDsK1rwPKbuQ+s8f5y1hWpYenP4CqsxOymkudc= github.com/aws/aws-sdk-go-v2/service/osis v1.11.0 h1:DO6ZBGQ1e8dkEO/dyFBfCfA3EyhYvUpVSsNNvZ1WlGc= github.com/aws/aws-sdk-go-v2/service/osis v1.11.0/go.mod h1:NnA7zLCoOx+mhlSrIJjU/rtThQOcrTPch5shRttwTds= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.0 h1:sA2XaV1iNxcrLysD9S2c/m/aHapZl+DenPCX7lWgHdU= From b0c0ed4448dc077a66b116c5c9a33d046fb48ffa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:52 -0400 Subject: [PATCH 147/208] go get github.com/aws/aws-sdk-go-v2/service/osis. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 49642fa49cd..3b09f4214fc 100644 --- a/go.mod +++ b/go.mod @@ -135,7 +135,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/oam v1.12.1 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.1 github.com/aws/aws-sdk-go-v2/service/organizations v1.28.1 - github.com/aws/aws-sdk-go-v2/service/osis v1.11.0 + github.com/aws/aws-sdk-go-v2/service/osis v1.11.1 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.0 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.0 github.com/aws/aws-sdk-go-v2/service/pipes v1.13.0 diff --git a/go.sum b/go.sum index 5e6faf689e1..1cd6fc888a2 100644 --- a/go.sum +++ b/go.sum @@ -300,8 +300,8 @@ github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.1 h1:BRAM7tTwHJo github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.1/go.mod h1:JhHI5YxjlRL5IqQPcijTGs8e7B0mVLLk1fpssVqjZaY= github.com/aws/aws-sdk-go-v2/service/organizations v1.28.1 h1:dfjBY/IdKIGBvE46uNHYFW9csLGt683je80+fAFiLmw= github.com/aws/aws-sdk-go-v2/service/organizations v1.28.1/go.mod h1:asny2SDsK1rwPKbuQ+s8f5y1hWpYenP4CqsxOymkudc= -github.com/aws/aws-sdk-go-v2/service/osis v1.11.0 h1:DO6ZBGQ1e8dkEO/dyFBfCfA3EyhYvUpVSsNNvZ1WlGc= -github.com/aws/aws-sdk-go-v2/service/osis v1.11.0/go.mod h1:NnA7zLCoOx+mhlSrIJjU/rtThQOcrTPch5shRttwTds= +github.com/aws/aws-sdk-go-v2/service/osis v1.11.1 h1:PvMmCkbmm6+IaStuc45PjM/IykBDYUHnJQBMCLJwWsk= +github.com/aws/aws-sdk-go-v2/service/osis v1.11.1/go.mod h1:RBQgmsqEtnAxY9OVxzJkFVRQ0u1l6+SLtAw4HpjpKwE= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.0 h1:sA2XaV1iNxcrLysD9S2c/m/aHapZl+DenPCX7lWgHdU= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.0/go.mod h1:R5vo8yPCzJaUJnKYDgUdtvz9CGTXPfI4KZ1ebwFN+zA= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.0 h1:rWpuyP9zpzrMw9av+5Yhc+vCYWBW8LoQmd3D9ODFrco= From d557b7d766a06a5cd39b48a02033ce5ce9246303 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:53 -0400 Subject: [PATCH 148/208] go get github.com/aws/aws-sdk-go-v2/service/paymentcryptography. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3b09f4214fc..dc6abb28e58 100644 --- a/go.mod +++ b/go.mod @@ -136,7 +136,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.1 github.com/aws/aws-sdk-go-v2/service/organizations v1.28.1 github.com/aws/aws-sdk-go-v2/service/osis v1.11.1 - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.0 + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.1 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.0 github.com/aws/aws-sdk-go-v2/service/pipes v1.13.0 github.com/aws/aws-sdk-go-v2/service/polly v1.41.0 diff --git a/go.sum b/go.sum index 1cd6fc888a2..f4a6344b545 100644 --- a/go.sum +++ b/go.sum @@ -302,8 +302,8 @@ github.com/aws/aws-sdk-go-v2/service/organizations v1.28.1 h1:dfjBY/IdKIGBvE46uN github.com/aws/aws-sdk-go-v2/service/organizations v1.28.1/go.mod h1:asny2SDsK1rwPKbuQ+s8f5y1hWpYenP4CqsxOymkudc= github.com/aws/aws-sdk-go-v2/service/osis v1.11.1 h1:PvMmCkbmm6+IaStuc45PjM/IykBDYUHnJQBMCLJwWsk= github.com/aws/aws-sdk-go-v2/service/osis v1.11.1/go.mod h1:RBQgmsqEtnAxY9OVxzJkFVRQ0u1l6+SLtAw4HpjpKwE= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.0 h1:sA2XaV1iNxcrLysD9S2c/m/aHapZl+DenPCX7lWgHdU= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.0/go.mod h1:R5vo8yPCzJaUJnKYDgUdtvz9CGTXPfI4KZ1ebwFN+zA= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.1 h1:F/5ouMfQxLkRO53C8HVHFuOzMmugJEXJpgFuft9noyA= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.1/go.mod h1:VHsagvynhabHbLl4DtdjtWQ8GgmZl6qw/Sc4ix78QWs= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.0 h1:rWpuyP9zpzrMw9av+5Yhc+vCYWBW8LoQmd3D9ODFrco= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.0/go.mod h1:v/8Whq6U3QgxFH/PRElHRVbQz64BRaGVq0FDXfUksRM= github.com/aws/aws-sdk-go-v2/service/pipes v1.13.0 h1:dCbHGnHY2lcM3oR3dMJSGN/X+QykH7m5V0JGpcmLRMw= From d92944d91df5c5f35475b58e6f0288f6991df197 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:54 -0400 Subject: [PATCH 149/208] go get github.com/aws/aws-sdk-go-v2/service/pcaconnectorad. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index dc6abb28e58..8f9afa4e9af 100644 --- a/go.mod +++ b/go.mod @@ -137,7 +137,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/organizations v1.28.1 github.com/aws/aws-sdk-go-v2/service/osis v1.11.1 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.1 - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.0 + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.1 github.com/aws/aws-sdk-go-v2/service/pipes v1.13.0 github.com/aws/aws-sdk-go-v2/service/polly v1.41.0 github.com/aws/aws-sdk-go-v2/service/pricing v1.29.0 diff --git a/go.sum b/go.sum index f4a6344b545..a5631653f24 100644 --- a/go.sum +++ b/go.sum @@ -304,8 +304,8 @@ github.com/aws/aws-sdk-go-v2/service/osis v1.11.1 h1:PvMmCkbmm6+IaStuc45PjM/IykB github.com/aws/aws-sdk-go-v2/service/osis v1.11.1/go.mod h1:RBQgmsqEtnAxY9OVxzJkFVRQ0u1l6+SLtAw4HpjpKwE= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.1 h1:F/5ouMfQxLkRO53C8HVHFuOzMmugJEXJpgFuft9noyA= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.1/go.mod h1:VHsagvynhabHbLl4DtdjtWQ8GgmZl6qw/Sc4ix78QWs= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.0 h1:rWpuyP9zpzrMw9av+5Yhc+vCYWBW8LoQmd3D9ODFrco= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.0/go.mod h1:v/8Whq6U3QgxFH/PRElHRVbQz64BRaGVq0FDXfUksRM= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.1 h1:QdWiKfoRzXamzsL/ejbnWI/bPrtHDmoxAnqLD5h2Qwg= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.1/go.mod h1:heR4dYebTI0Gcj2jn6OK8m/She92XlTGexlkG+CSkcI= github.com/aws/aws-sdk-go-v2/service/pipes v1.13.0 h1:dCbHGnHY2lcM3oR3dMJSGN/X+QykH7m5V0JGpcmLRMw= github.com/aws/aws-sdk-go-v2/service/pipes v1.13.0/go.mod h1:WyWitPfg1KQr8e1VCNJKlMENK1RWQH60LYNfOKRsmRE= github.com/aws/aws-sdk-go-v2/service/polly v1.41.0 h1:4019JiZsZ1RkUzO3Zh+tlAqOFmS5LTxPQ9ZzVdXxpWU= From 2ae35a64e74b561a48905c4558d11f28573674bd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:55 -0400 Subject: [PATCH 150/208] go get github.com/aws/aws-sdk-go-v2/service/pipes. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8f9afa4e9af..8dfd15215f8 100644 --- a/go.mod +++ b/go.mod @@ -138,7 +138,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/osis v1.11.1 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.1 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.1 - github.com/aws/aws-sdk-go-v2/service/pipes v1.13.0 + github.com/aws/aws-sdk-go-v2/service/pipes v1.13.1 github.com/aws/aws-sdk-go-v2/service/polly v1.41.0 github.com/aws/aws-sdk-go-v2/service/pricing v1.29.0 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.0 diff --git a/go.sum b/go.sum index a5631653f24..47da775c5e2 100644 --- a/go.sum +++ b/go.sum @@ -306,8 +306,8 @@ github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.1 h1:F/5ouMfQxLkR github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.1/go.mod h1:VHsagvynhabHbLl4DtdjtWQ8GgmZl6qw/Sc4ix78QWs= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.1 h1:QdWiKfoRzXamzsL/ejbnWI/bPrtHDmoxAnqLD5h2Qwg= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.1/go.mod h1:heR4dYebTI0Gcj2jn6OK8m/She92XlTGexlkG+CSkcI= -github.com/aws/aws-sdk-go-v2/service/pipes v1.13.0 h1:dCbHGnHY2lcM3oR3dMJSGN/X+QykH7m5V0JGpcmLRMw= -github.com/aws/aws-sdk-go-v2/service/pipes v1.13.0/go.mod h1:WyWitPfg1KQr8e1VCNJKlMENK1RWQH60LYNfOKRsmRE= +github.com/aws/aws-sdk-go-v2/service/pipes v1.13.1 h1:nDGPNXJPc/Zyjdenbkmfe8+qJaXy16R0CCZNpAJzsYk= +github.com/aws/aws-sdk-go-v2/service/pipes v1.13.1/go.mod h1:98vnplOvsabKozsg0U14ges5xzrrVAkK+0fkc29WxFY= github.com/aws/aws-sdk-go-v2/service/polly v1.41.0 h1:4019JiZsZ1RkUzO3Zh+tlAqOFmS5LTxPQ9ZzVdXxpWU= github.com/aws/aws-sdk-go-v2/service/polly v1.41.0/go.mod h1:d2gHPwQLpV4GJ9VOFgRHjPHtRzR5sT1X+cK/c9+ES60= github.com/aws/aws-sdk-go-v2/service/pricing v1.29.0 h1:EV2bGIhwWstC+xobp+dqY6SkXkizoIf/BOm2rlA6Oj4= From 470a2c21b376c8ab4cc31ccaa24723b106dfb314 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:55 -0400 Subject: [PATCH 151/208] go get github.com/aws/aws-sdk-go-v2/service/polly. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8dfd15215f8..bc54d902044 100644 --- a/go.mod +++ b/go.mod @@ -139,7 +139,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.1 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.1 github.com/aws/aws-sdk-go-v2/service/pipes v1.13.1 - github.com/aws/aws-sdk-go-v2/service/polly v1.41.0 + github.com/aws/aws-sdk-go-v2/service/polly v1.41.1 github.com/aws/aws-sdk-go-v2/service/pricing v1.29.0 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.0 github.com/aws/aws-sdk-go-v2/service/qldb v1.22.0 diff --git a/go.sum b/go.sum index 47da775c5e2..5d00bf6770c 100644 --- a/go.sum +++ b/go.sum @@ -308,8 +308,8 @@ github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.1 h1:QdWiKfoRzXamzsL/ej github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.1/go.mod h1:heR4dYebTI0Gcj2jn6OK8m/She92XlTGexlkG+CSkcI= github.com/aws/aws-sdk-go-v2/service/pipes v1.13.1 h1:nDGPNXJPc/Zyjdenbkmfe8+qJaXy16R0CCZNpAJzsYk= github.com/aws/aws-sdk-go-v2/service/pipes v1.13.1/go.mod h1:98vnplOvsabKozsg0U14ges5xzrrVAkK+0fkc29WxFY= -github.com/aws/aws-sdk-go-v2/service/polly v1.41.0 h1:4019JiZsZ1RkUzO3Zh+tlAqOFmS5LTxPQ9ZzVdXxpWU= -github.com/aws/aws-sdk-go-v2/service/polly v1.41.0/go.mod h1:d2gHPwQLpV4GJ9VOFgRHjPHtRzR5sT1X+cK/c9+ES60= +github.com/aws/aws-sdk-go-v2/service/polly v1.41.1 h1:+hSr0DpeXsDLIUzQy9Mtc0MHr+RWj5fwLTBVr/OkUeo= +github.com/aws/aws-sdk-go-v2/service/polly v1.41.1/go.mod h1:SoN8AjKOVVC/pBAa6CsFaqqEKAF3ZIuG6iTW3XkQm/Y= github.com/aws/aws-sdk-go-v2/service/pricing v1.29.0 h1:EV2bGIhwWstC+xobp+dqY6SkXkizoIf/BOm2rlA6Oj4= github.com/aws/aws-sdk-go-v2/service/pricing v1.29.0/go.mod h1:ybiXcXGCPNkoeZ0SWEhW2YqAuof+VoFaY92Hmt9wEZg= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.0 h1:08Sqhl9+MFQSvAjdaqrmkEnEg4owTYH8faulWkfjawk= From f7b8eef2bd50534e3034db8454d5c348690cfda0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:56 -0400 Subject: [PATCH 152/208] go get github.com/aws/aws-sdk-go-v2/service/pricing. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index bc54d902044..04f53810621 100644 --- a/go.mod +++ b/go.mod @@ -140,7 +140,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.1 github.com/aws/aws-sdk-go-v2/service/pipes v1.13.1 github.com/aws/aws-sdk-go-v2/service/polly v1.41.1 - github.com/aws/aws-sdk-go-v2/service/pricing v1.29.0 + github.com/aws/aws-sdk-go-v2/service/pricing v1.29.1 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.0 github.com/aws/aws-sdk-go-v2/service/qldb v1.22.0 github.com/aws/aws-sdk-go-v2/service/ram v1.26.0 diff --git a/go.sum b/go.sum index 5d00bf6770c..35236d91d89 100644 --- a/go.sum +++ b/go.sum @@ -310,8 +310,8 @@ github.com/aws/aws-sdk-go-v2/service/pipes v1.13.1 h1:nDGPNXJPc/Zyjdenbkmfe8+qJa github.com/aws/aws-sdk-go-v2/service/pipes v1.13.1/go.mod h1:98vnplOvsabKozsg0U14ges5xzrrVAkK+0fkc29WxFY= github.com/aws/aws-sdk-go-v2/service/polly v1.41.1 h1:+hSr0DpeXsDLIUzQy9Mtc0MHr+RWj5fwLTBVr/OkUeo= github.com/aws/aws-sdk-go-v2/service/polly v1.41.1/go.mod h1:SoN8AjKOVVC/pBAa6CsFaqqEKAF3ZIuG6iTW3XkQm/Y= -github.com/aws/aws-sdk-go-v2/service/pricing v1.29.0 h1:EV2bGIhwWstC+xobp+dqY6SkXkizoIf/BOm2rlA6Oj4= -github.com/aws/aws-sdk-go-v2/service/pricing v1.29.0/go.mod h1:ybiXcXGCPNkoeZ0SWEhW2YqAuof+VoFaY92Hmt9wEZg= +github.com/aws/aws-sdk-go-v2/service/pricing v1.29.1 h1:IwnxNjvhqtPQNNW93xBVTzRKJ3BI9GSEDu1w+YMXfUI= +github.com/aws/aws-sdk-go-v2/service/pricing v1.29.1/go.mod h1:yZMXOzGy2QtzacpvpWaptEuYXWoFcINn04FUjnNn39w= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.0 h1:08Sqhl9+MFQSvAjdaqrmkEnEg4owTYH8faulWkfjawk= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.0/go.mod h1:fE5HSf36IsNrPZsx3eSnTRrXPILIHAZfVOmYL3frUrU= github.com/aws/aws-sdk-go-v2/service/qldb v1.22.0 h1:3IhtqPixRMbRL2hszlzFUjANJrK37XyIeSJcPB27U0Y= From c63ed50d78764df9ea1a54c87a06eea6640a4670 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:57 -0400 Subject: [PATCH 153/208] go get github.com/aws/aws-sdk-go-v2/service/qbusiness. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 04f53810621..cb58fa3de29 100644 --- a/go.mod +++ b/go.mod @@ -141,7 +141,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pipes v1.13.1 github.com/aws/aws-sdk-go-v2/service/polly v1.41.1 github.com/aws/aws-sdk-go-v2/service/pricing v1.29.1 - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.0 + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.1 github.com/aws/aws-sdk-go-v2/service/qldb v1.22.0 github.com/aws/aws-sdk-go-v2/service/ram v1.26.0 github.com/aws/aws-sdk-go-v2/service/rbin v1.17.0 diff --git a/go.sum b/go.sum index 35236d91d89..ba950b931da 100644 --- a/go.sum +++ b/go.sum @@ -312,8 +312,8 @@ github.com/aws/aws-sdk-go-v2/service/polly v1.41.1 h1:+hSr0DpeXsDLIUzQy9Mtc0MHr+ github.com/aws/aws-sdk-go-v2/service/polly v1.41.1/go.mod h1:SoN8AjKOVVC/pBAa6CsFaqqEKAF3ZIuG6iTW3XkQm/Y= github.com/aws/aws-sdk-go-v2/service/pricing v1.29.1 h1:IwnxNjvhqtPQNNW93xBVTzRKJ3BI9GSEDu1w+YMXfUI= github.com/aws/aws-sdk-go-v2/service/pricing v1.29.1/go.mod h1:yZMXOzGy2QtzacpvpWaptEuYXWoFcINn04FUjnNn39w= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.0 h1:08Sqhl9+MFQSvAjdaqrmkEnEg4owTYH8faulWkfjawk= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.0/go.mod h1:fE5HSf36IsNrPZsx3eSnTRrXPILIHAZfVOmYL3frUrU= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.1 h1:xHupkKEZm928HDycbYl7WBMNYuDzPOJ+sR8UL/B32rM= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.1/go.mod h1:EU7zeEUzGV+vjgr9IjhW5QhjlgY5s7wjBsvpD1XCZbE= github.com/aws/aws-sdk-go-v2/service/qldb v1.22.0 h1:3IhtqPixRMbRL2hszlzFUjANJrK37XyIeSJcPB27U0Y= github.com/aws/aws-sdk-go-v2/service/qldb v1.22.0/go.mod h1:4hd2SxINA5DfjEnSXOTVKIDfMBu3f3f8ix/Awrg8xZo= github.com/aws/aws-sdk-go-v2/service/ram v1.26.0 h1:xOXgRYmVnffog74K2oOdmpF4AFGuxvD5sf4JoblH9/E= From 5df2edeefc5bfcd13155a80e8dbc5cd561047387 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:58 -0400 Subject: [PATCH 154/208] go get github.com/aws/aws-sdk-go-v2/service/qldb. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cb58fa3de29..4e3bfab2fbc 100644 --- a/go.mod +++ b/go.mod @@ -142,7 +142,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/polly v1.41.1 github.com/aws/aws-sdk-go-v2/service/pricing v1.29.1 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.1 - github.com/aws/aws-sdk-go-v2/service/qldb v1.22.0 + github.com/aws/aws-sdk-go-v2/service/qldb v1.22.1 github.com/aws/aws-sdk-go-v2/service/ram v1.26.0 github.com/aws/aws-sdk-go-v2/service/rbin v1.17.0 github.com/aws/aws-sdk-go-v2/service/rds v1.80.0 diff --git a/go.sum b/go.sum index ba950b931da..343a8ab7db1 100644 --- a/go.sum +++ b/go.sum @@ -314,8 +314,8 @@ github.com/aws/aws-sdk-go-v2/service/pricing v1.29.1 h1:IwnxNjvhqtPQNNW93xBVTzRK github.com/aws/aws-sdk-go-v2/service/pricing v1.29.1/go.mod h1:yZMXOzGy2QtzacpvpWaptEuYXWoFcINn04FUjnNn39w= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.1 h1:xHupkKEZm928HDycbYl7WBMNYuDzPOJ+sR8UL/B32rM= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.1/go.mod h1:EU7zeEUzGV+vjgr9IjhW5QhjlgY5s7wjBsvpD1XCZbE= -github.com/aws/aws-sdk-go-v2/service/qldb v1.22.0 h1:3IhtqPixRMbRL2hszlzFUjANJrK37XyIeSJcPB27U0Y= -github.com/aws/aws-sdk-go-v2/service/qldb v1.22.0/go.mod h1:4hd2SxINA5DfjEnSXOTVKIDfMBu3f3f8ix/Awrg8xZo= +github.com/aws/aws-sdk-go-v2/service/qldb v1.22.1 h1:gpLL+eTaS4W3jVH88x811rgYLbUeGdtKenQgvZA6nBk= +github.com/aws/aws-sdk-go-v2/service/qldb v1.22.1/go.mod h1:zd8pWnlLZxx2dk3k1ekl9WJOdTZW0v10+lZnPUFztLs= github.com/aws/aws-sdk-go-v2/service/ram v1.26.0 h1:xOXgRYmVnffog74K2oOdmpF4AFGuxvD5sf4JoblH9/E= github.com/aws/aws-sdk-go-v2/service/ram v1.26.0/go.mod h1:VSstQuq+G3Snk52pK7hxgW5e+/aRPBAHXVf8HokEyDY= github.com/aws/aws-sdk-go-v2/service/rbin v1.17.0 h1:MwHcvJqUyY+U38k8cREkl49Sj1f4uH5Th6VrDcXqfjk= From 88c2045275ef4491330269d75bcec0655d42e33e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:58 -0400 Subject: [PATCH 155/208] go get github.com/aws/aws-sdk-go-v2/service/ram. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4e3bfab2fbc..2d26ef25bfb 100644 --- a/go.mod +++ b/go.mod @@ -143,7 +143,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pricing v1.29.1 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.1 github.com/aws/aws-sdk-go-v2/service/qldb v1.22.1 - github.com/aws/aws-sdk-go-v2/service/ram v1.26.0 + github.com/aws/aws-sdk-go-v2/service/ram v1.26.1 github.com/aws/aws-sdk-go-v2/service/rbin v1.17.0 github.com/aws/aws-sdk-go-v2/service/rds v1.80.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.45.0 diff --git a/go.sum b/go.sum index 343a8ab7db1..be8428b9ac9 100644 --- a/go.sum +++ b/go.sum @@ -316,8 +316,8 @@ github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.1 h1:xHupkKEZm928HDycbYl7WBM github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.1/go.mod h1:EU7zeEUzGV+vjgr9IjhW5QhjlgY5s7wjBsvpD1XCZbE= github.com/aws/aws-sdk-go-v2/service/qldb v1.22.1 h1:gpLL+eTaS4W3jVH88x811rgYLbUeGdtKenQgvZA6nBk= github.com/aws/aws-sdk-go-v2/service/qldb v1.22.1/go.mod h1:zd8pWnlLZxx2dk3k1ekl9WJOdTZW0v10+lZnPUFztLs= -github.com/aws/aws-sdk-go-v2/service/ram v1.26.0 h1:xOXgRYmVnffog74K2oOdmpF4AFGuxvD5sf4JoblH9/E= -github.com/aws/aws-sdk-go-v2/service/ram v1.26.0/go.mod h1:VSstQuq+G3Snk52pK7hxgW5e+/aRPBAHXVf8HokEyDY= +github.com/aws/aws-sdk-go-v2/service/ram v1.26.1 h1:1UcUsMsHB7ZnpcUYNwBTX90hFjIZrhf8Xu00R9Vo+Kg= +github.com/aws/aws-sdk-go-v2/service/ram v1.26.1/go.mod h1:e/3wE+afnOAeolpqyg8fKAQK/kKya+ycDW62/X4vjK8= github.com/aws/aws-sdk-go-v2/service/rbin v1.17.0 h1:MwHcvJqUyY+U38k8cREkl49Sj1f4uH5Th6VrDcXqfjk= github.com/aws/aws-sdk-go-v2/service/rbin v1.17.0/go.mod h1:omAuKAoQMFWf8ZUkd+d9/apTKhIiiBVqbkDH9LogoVs= github.com/aws/aws-sdk-go-v2/service/rds v1.80.0 h1:8VoBRoKh2paHslGSveRqxSiPnFbXfiYxBG1/EzSDzC8= From 1e25efd20807ab3a13f0c219ac809b77d1709e4e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:40:59 -0400 Subject: [PATCH 156/208] go get github.com/aws/aws-sdk-go-v2/service/rbin. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2d26ef25bfb..1a81aa651ac 100644 --- a/go.mod +++ b/go.mod @@ -144,7 +144,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.1 github.com/aws/aws-sdk-go-v2/service/qldb v1.22.1 github.com/aws/aws-sdk-go-v2/service/ram v1.26.1 - github.com/aws/aws-sdk-go-v2/service/rbin v1.17.0 + github.com/aws/aws-sdk-go-v2/service/rbin v1.17.1 github.com/aws/aws-sdk-go-v2/service/rds v1.80.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.45.0 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.0 diff --git a/go.sum b/go.sum index be8428b9ac9..7632a2d0f2c 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/aws/aws-sdk-go-v2/service/qldb v1.22.1 h1:gpLL+eTaS4W3jVH88x811rgYLbU github.com/aws/aws-sdk-go-v2/service/qldb v1.22.1/go.mod h1:zd8pWnlLZxx2dk3k1ekl9WJOdTZW0v10+lZnPUFztLs= github.com/aws/aws-sdk-go-v2/service/ram v1.26.1 h1:1UcUsMsHB7ZnpcUYNwBTX90hFjIZrhf8Xu00R9Vo+Kg= github.com/aws/aws-sdk-go-v2/service/ram v1.26.1/go.mod h1:e/3wE+afnOAeolpqyg8fKAQK/kKya+ycDW62/X4vjK8= -github.com/aws/aws-sdk-go-v2/service/rbin v1.17.0 h1:MwHcvJqUyY+U38k8cREkl49Sj1f4uH5Th6VrDcXqfjk= -github.com/aws/aws-sdk-go-v2/service/rbin v1.17.0/go.mod h1:omAuKAoQMFWf8ZUkd+d9/apTKhIiiBVqbkDH9LogoVs= +github.com/aws/aws-sdk-go-v2/service/rbin v1.17.1 h1:lQRI9dPRfnj8s57U52zoxia7k61brR+0AoTylUnlHMA= +github.com/aws/aws-sdk-go-v2/service/rbin v1.17.1/go.mod h1:K4NSpziaXU08Y9AWCbnq6hP+wFRSlqYCTI15CBWM/bA= github.com/aws/aws-sdk-go-v2/service/rds v1.80.0 h1:8VoBRoKh2paHslGSveRqxSiPnFbXfiYxBG1/EzSDzC8= github.com/aws/aws-sdk-go-v2/service/rds v1.80.0/go.mod h1:yLcoHSwyRp/AKOXNQUGzdF+u3zfNIco3sx+j5AU7VL8= github.com/aws/aws-sdk-go-v2/service/redshift v1.45.0 h1:/UkJsgFo45+8hPrHTOwOnKotD6nCaGbrqQ+Q+yme59w= From 2d6a8def1ea6aa315d8872d4996ddf2a0c3d294c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:00 -0400 Subject: [PATCH 157/208] go get github.com/aws/aws-sdk-go-v2/service/rds. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1a81aa651ac..4c756e748e4 100644 --- a/go.mod +++ b/go.mod @@ -145,7 +145,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/qldb v1.22.1 github.com/aws/aws-sdk-go-v2/service/ram v1.26.1 github.com/aws/aws-sdk-go-v2/service/rbin v1.17.1 - github.com/aws/aws-sdk-go-v2/service/rds v1.80.0 + github.com/aws/aws-sdk-go-v2/service/rds v1.80.1 github.com/aws/aws-sdk-go-v2/service/redshift v1.45.0 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.0 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.0 diff --git a/go.sum b/go.sum index 7632a2d0f2c..ef009df73fe 100644 --- a/go.sum +++ b/go.sum @@ -320,8 +320,8 @@ github.com/aws/aws-sdk-go-v2/service/ram v1.26.1 h1:1UcUsMsHB7ZnpcUYNwBTX90hFjIZ github.com/aws/aws-sdk-go-v2/service/ram v1.26.1/go.mod h1:e/3wE+afnOAeolpqyg8fKAQK/kKya+ycDW62/X4vjK8= github.com/aws/aws-sdk-go-v2/service/rbin v1.17.1 h1:lQRI9dPRfnj8s57U52zoxia7k61brR+0AoTylUnlHMA= github.com/aws/aws-sdk-go-v2/service/rbin v1.17.1/go.mod h1:K4NSpziaXU08Y9AWCbnq6hP+wFRSlqYCTI15CBWM/bA= -github.com/aws/aws-sdk-go-v2/service/rds v1.80.0 h1:8VoBRoKh2paHslGSveRqxSiPnFbXfiYxBG1/EzSDzC8= -github.com/aws/aws-sdk-go-v2/service/rds v1.80.0/go.mod h1:yLcoHSwyRp/AKOXNQUGzdF+u3zfNIco3sx+j5AU7VL8= +github.com/aws/aws-sdk-go-v2/service/rds v1.80.1 h1:o0DyV3AWeuAwrBVeoW/kCZJi4oGCBHPS3E5Ppmc3fLE= +github.com/aws/aws-sdk-go-v2/service/rds v1.80.1/go.mod h1:lmaCww9B42S2WBaJNa5v+HeRpoGO+9gO+SwYJtNV8mw= github.com/aws/aws-sdk-go-v2/service/redshift v1.45.0 h1:/UkJsgFo45+8hPrHTOwOnKotD6nCaGbrqQ+Q+yme59w= github.com/aws/aws-sdk-go-v2/service/redshift v1.45.0/go.mod h1:DQY+HM2caihCnHUIHr6W621GBD3SELTotJ2X/y/0rbg= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.0 h1:9XGFu3yf8TmjxD8l9V5G/+5LFvy8bcc91YTaWMzW+aA= From 1d1d2f0f6bde53422fca97ded8c38f05bdf32cb8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:01 -0400 Subject: [PATCH 158/208] go get github.com/aws/aws-sdk-go-v2/service/redshift. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4c756e748e4..bb8761eabfd 100644 --- a/go.mod +++ b/go.mod @@ -146,7 +146,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ram v1.26.1 github.com/aws/aws-sdk-go-v2/service/rbin v1.17.1 github.com/aws/aws-sdk-go-v2/service/rds v1.80.1 - github.com/aws/aws-sdk-go-v2/service/redshift v1.45.0 + github.com/aws/aws-sdk-go-v2/service/redshift v1.45.1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.0 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.0 github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.0 diff --git a/go.sum b/go.sum index ef009df73fe..ea148fec58d 100644 --- a/go.sum +++ b/go.sum @@ -322,8 +322,8 @@ github.com/aws/aws-sdk-go-v2/service/rbin v1.17.1 h1:lQRI9dPRfnj8s57U52zoxia7k61 github.com/aws/aws-sdk-go-v2/service/rbin v1.17.1/go.mod h1:K4NSpziaXU08Y9AWCbnq6hP+wFRSlqYCTI15CBWM/bA= github.com/aws/aws-sdk-go-v2/service/rds v1.80.1 h1:o0DyV3AWeuAwrBVeoW/kCZJi4oGCBHPS3E5Ppmc3fLE= github.com/aws/aws-sdk-go-v2/service/rds v1.80.1/go.mod h1:lmaCww9B42S2WBaJNa5v+HeRpoGO+9gO+SwYJtNV8mw= -github.com/aws/aws-sdk-go-v2/service/redshift v1.45.0 h1:/UkJsgFo45+8hPrHTOwOnKotD6nCaGbrqQ+Q+yme59w= -github.com/aws/aws-sdk-go-v2/service/redshift v1.45.0/go.mod h1:DQY+HM2caihCnHUIHr6W621GBD3SELTotJ2X/y/0rbg= +github.com/aws/aws-sdk-go-v2/service/redshift v1.45.1 h1:AdnF43k4XVzTTtVXtqyy2v20RiptDLmUX7ZuokdF5I0= +github.com/aws/aws-sdk-go-v2/service/redshift v1.45.1/go.mod h1:3S2IEN/LSwonlc30Hoyu06jBj/YOz6m+uHffkCJ2D3o= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.0 h1:9XGFu3yf8TmjxD8l9V5G/+5LFvy8bcc91YTaWMzW+aA= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.0/go.mod h1:EjEwXgwEm6KWNVBnzTf0CoJJcbm/lCvQgJL5uAXVZiA= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.0 h1:GbLcRmDKU3ZWJyjHVUMZVQKHCulQCgnvHUQHQ4XfVSM= From d114e6128d99cd241861243e1a8b27f84dbc613b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:02 -0400 Subject: [PATCH 159/208] go get github.com/aws/aws-sdk-go-v2/service/redshiftdata. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index bb8761eabfd..02f7d9ae22c 100644 --- a/go.mod +++ b/go.mod @@ -147,7 +147,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rbin v1.17.1 github.com/aws/aws-sdk-go-v2/service/rds v1.80.1 github.com/aws/aws-sdk-go-v2/service/redshift v1.45.1 - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.0 + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.1 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.0 github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.0 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.0 diff --git a/go.sum b/go.sum index ea148fec58d..485b343788a 100644 --- a/go.sum +++ b/go.sum @@ -324,8 +324,8 @@ github.com/aws/aws-sdk-go-v2/service/rds v1.80.1 h1:o0DyV3AWeuAwrBVeoW/kCZJi4oGC github.com/aws/aws-sdk-go-v2/service/rds v1.80.1/go.mod h1:lmaCww9B42S2WBaJNa5v+HeRpoGO+9gO+SwYJtNV8mw= github.com/aws/aws-sdk-go-v2/service/redshift v1.45.1 h1:AdnF43k4XVzTTtVXtqyy2v20RiptDLmUX7ZuokdF5I0= github.com/aws/aws-sdk-go-v2/service/redshift v1.45.1/go.mod h1:3S2IEN/LSwonlc30Hoyu06jBj/YOz6m+uHffkCJ2D3o= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.0 h1:9XGFu3yf8TmjxD8l9V5G/+5LFvy8bcc91YTaWMzW+aA= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.0/go.mod h1:EjEwXgwEm6KWNVBnzTf0CoJJcbm/lCvQgJL5uAXVZiA= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.1 h1:QOxr2Mgm2O4Syt7ROT2UCNDVPvcEjoBW/5DnlWw3GAc= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.1/go.mod h1:z1qDE+l45V0J/hAmZ8d9cO5MY207kz5YH6o3kVB2quk= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.0 h1:GbLcRmDKU3ZWJyjHVUMZVQKHCulQCgnvHUQHQ4XfVSM= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.0/go.mod h1:q3rWe+TdHxcC3LAjI9MD0o95xCMuJcE9nRcA4E1nYI8= github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.0 h1:qTjv3yq39ZDWuFxSg7VthLkMPB6415pN95LbsHrQuGg= From 815414c8a134734813f63acf37257c5f0498cda2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:02 -0400 Subject: [PATCH 160/208] go get github.com/aws/aws-sdk-go-v2/service/redshiftserverless. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 02f7d9ae22c..c2e19980e41 100644 --- a/go.mod +++ b/go.mod @@ -148,7 +148,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rds v1.80.1 github.com/aws/aws-sdk-go-v2/service/redshift v1.45.1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.1 - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.0 + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.1 github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.0 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.0 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.0 diff --git a/go.sum b/go.sum index 485b343788a..5ed2a7f8550 100644 --- a/go.sum +++ b/go.sum @@ -326,8 +326,8 @@ github.com/aws/aws-sdk-go-v2/service/redshift v1.45.1 h1:AdnF43k4XVzTTtVXtqyy2v2 github.com/aws/aws-sdk-go-v2/service/redshift v1.45.1/go.mod h1:3S2IEN/LSwonlc30Hoyu06jBj/YOz6m+uHffkCJ2D3o= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.1 h1:QOxr2Mgm2O4Syt7ROT2UCNDVPvcEjoBW/5DnlWw3GAc= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.1/go.mod h1:z1qDE+l45V0J/hAmZ8d9cO5MY207kz5YH6o3kVB2quk= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.0 h1:GbLcRmDKU3ZWJyjHVUMZVQKHCulQCgnvHUQHQ4XfVSM= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.0/go.mod h1:q3rWe+TdHxcC3LAjI9MD0o95xCMuJcE9nRcA4E1nYI8= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.1 h1:VRAjP3iJ684rhGmZ1LRy+8SARfnfrOB6NeT9XaccflA= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.1/go.mod h1:+b6LJEQpqKMBA7Jw1fgpWngaZWiJtYGHtW4mm3awuos= github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.0 h1:qTjv3yq39ZDWuFxSg7VthLkMPB6415pN95LbsHrQuGg= github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.0/go.mod h1:62kYN/bu2HmN5D4DDPGEPp2RSk88DBkZMmc9BN6W1aU= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.0 h1:FdTAqyJJEQNaLv+gQqSWHmcY8vysdcMy9fOhOIRaaSQ= From 0c41ffc54486dbc149c26ca36206f05003af269f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:03 -0400 Subject: [PATCH 161/208] go get github.com/aws/aws-sdk-go-v2/service/rekognition. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c2e19980e41..260fc11cc77 100644 --- a/go.mod +++ b/go.mod @@ -149,7 +149,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshift v1.45.1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.1 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.1 - github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.0 + github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.1 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.0 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.0 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.0 diff --git a/go.sum b/go.sum index 5ed2a7f8550..bd235becc96 100644 --- a/go.sum +++ b/go.sum @@ -328,8 +328,8 @@ github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.1 h1:QOxr2Mgm2O4Syt7ROT2 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.1/go.mod h1:z1qDE+l45V0J/hAmZ8d9cO5MY207kz5YH6o3kVB2quk= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.1 h1:VRAjP3iJ684rhGmZ1LRy+8SARfnfrOB6NeT9XaccflA= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.1/go.mod h1:+b6LJEQpqKMBA7Jw1fgpWngaZWiJtYGHtW4mm3awuos= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.0 h1:qTjv3yq39ZDWuFxSg7VthLkMPB6415pN95LbsHrQuGg= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.0/go.mod h1:62kYN/bu2HmN5D4DDPGEPp2RSk88DBkZMmc9BN6W1aU= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.1 h1:BsFFOLs6CTuzC8dxiAtrdtw8sjCoJydGiLXKPVjK1bg= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.1/go.mod h1:Tjh59zYOtIXSVQpJMxIWqkj/SONo8Crc0s6Z6CjBG1w= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.0 h1:FdTAqyJJEQNaLv+gQqSWHmcY8vysdcMy9fOhOIRaaSQ= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.0/go.mod h1:P7I9alD1m2weZzSd6C55oS5bb3IB4ou1XqEhE1W5pug= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.0 h1:joVrhKXPEIDeFoF+QDwGpv7VTRoDuMLCEs/u/u+ctBI= From 357ac7411cb0390d89a06e83eed342c7c068cae7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:04 -0400 Subject: [PATCH 162/208] go get github.com/aws/aws-sdk-go-v2/service/resourceexplorer2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 260fc11cc77..3c363c33e19 100644 --- a/go.mod +++ b/go.mod @@ -150,7 +150,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.1 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.1 github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.1 - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.0 + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.1 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.0 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.0 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.0 diff --git a/go.sum b/go.sum index bd235becc96..51986c52e90 100644 --- a/go.sum +++ b/go.sum @@ -330,8 +330,8 @@ github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.1 h1:VRAjP3iJ684rh github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.1/go.mod h1:+b6LJEQpqKMBA7Jw1fgpWngaZWiJtYGHtW4mm3awuos= github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.1 h1:BsFFOLs6CTuzC8dxiAtrdtw8sjCoJydGiLXKPVjK1bg= github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.1/go.mod h1:Tjh59zYOtIXSVQpJMxIWqkj/SONo8Crc0s6Z6CjBG1w= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.0 h1:FdTAqyJJEQNaLv+gQqSWHmcY8vysdcMy9fOhOIRaaSQ= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.0/go.mod h1:P7I9alD1m2weZzSd6C55oS5bb3IB4ou1XqEhE1W5pug= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.1 h1:o2MkvVZAahZX3ttqVmJJeCRAmIHQ98iJsLlmHXFjuCM= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.1/go.mod h1:Hq2k/Ovak4zs70o1r39jzn+jOfwsBaWYq79KY5ntvH4= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.0 h1:joVrhKXPEIDeFoF+QDwGpv7VTRoDuMLCEs/u/u+ctBI= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.0/go.mod h1:yYz0Ti5szl4rvf7hiI9FsYPf22Vjy0No4k7v7H4Ms28= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.0 h1:8zPwiUeRAMzLU5dZ+jL23bTVoy0TdKJyZ6LH0lOKzZU= From 180beb80ff029f36f947718a992e60e0a6946ea8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:05 -0400 Subject: [PATCH 163/208] go get github.com/aws/aws-sdk-go-v2/service/resourcegroups. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3c363c33e19..fa625403e32 100644 --- a/go.mod +++ b/go.mod @@ -151,7 +151,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.1 github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.1 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.1 - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.0 + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.1 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.0 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.0 github.com/aws/aws-sdk-go-v2/service/route53 v1.41.0 diff --git a/go.sum b/go.sum index 51986c52e90..3f3de2ce2f9 100644 --- a/go.sum +++ b/go.sum @@ -332,8 +332,8 @@ github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.1 h1:BsFFOLs6CTuzC8dxiAtr github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.1/go.mod h1:Tjh59zYOtIXSVQpJMxIWqkj/SONo8Crc0s6Z6CjBG1w= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.1 h1:o2MkvVZAahZX3ttqVmJJeCRAmIHQ98iJsLlmHXFjuCM= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.1/go.mod h1:Hq2k/Ovak4zs70o1r39jzn+jOfwsBaWYq79KY5ntvH4= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.0 h1:joVrhKXPEIDeFoF+QDwGpv7VTRoDuMLCEs/u/u+ctBI= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.0/go.mod h1:yYz0Ti5szl4rvf7hiI9FsYPf22Vjy0No4k7v7H4Ms28= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.1 h1:aR4MioMW7hiNGTcoz8rngzPF7U4oBssCr/N7oaNyr30= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.1/go.mod h1:gCiBxW2zE+VgC/gSU5a0gteSBjqo3uS906dLJoQgItw= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.0 h1:8zPwiUeRAMzLU5dZ+jL23bTVoy0TdKJyZ6LH0lOKzZU= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.0/go.mod h1:wp1n/0IPV/MOvs/sgqlwhdd8TsFLWC1ggUCNpicniDk= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.0 h1:PkRTzjDe1p4NjpF3jlexR8SqYse7FCZ9F2irAFT4/RY= From eb7d80a673062a58b2e96a7f4d62674b0706232a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:06 -0400 Subject: [PATCH 164/208] go get github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fa625403e32..e2652e3e14e 100644 --- a/go.mod +++ b/go.mod @@ -152,7 +152,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.1 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.1 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.1 - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.0 + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.0 github.com/aws/aws-sdk-go-v2/service/route53 v1.41.0 github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.0 diff --git a/go.sum b/go.sum index 3f3de2ce2f9..cfcd83a97c1 100644 --- a/go.sum +++ b/go.sum @@ -334,8 +334,8 @@ github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.1 h1:o2MkvVZAahZX3t github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.1/go.mod h1:Hq2k/Ovak4zs70o1r39jzn+jOfwsBaWYq79KY5ntvH4= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.1 h1:aR4MioMW7hiNGTcoz8rngzPF7U4oBssCr/N7oaNyr30= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.1/go.mod h1:gCiBxW2zE+VgC/gSU5a0gteSBjqo3uS906dLJoQgItw= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.0 h1:8zPwiUeRAMzLU5dZ+jL23bTVoy0TdKJyZ6LH0lOKzZU= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.0/go.mod h1:wp1n/0IPV/MOvs/sgqlwhdd8TsFLWC1ggUCNpicniDk= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1 h1:73im9DnuBD4+G8hHsbqb0NSA+n6QJ5ApFk6/YeOz8k8= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1/go.mod h1:p5FuKT8Rj4fnlT84Pzy7itV11NZ39Fwm/Y52S8Lg1Oc= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.0 h1:PkRTzjDe1p4NjpF3jlexR8SqYse7FCZ9F2irAFT4/RY= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.0/go.mod h1:GGzMuBJGT+INpSiVyJDD/SP87wRW+Nj1lEFSp9tyhxk= github.com/aws/aws-sdk-go-v2/service/route53 v1.41.0 h1:tvIBVabBmCMZvPFtT18HQbSjskzVEcSvdJIAjLQmP78= From 75755f50f2923e4ddeb887947dadb9acd1c4672d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:06 -0400 Subject: [PATCH 165/208] go get github.com/aws/aws-sdk-go-v2/service/rolesanywhere. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e2652e3e14e..81a6ea90b8a 100644 --- a/go.mod +++ b/go.mod @@ -153,7 +153,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.1 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.1 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1 - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.0 + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.1 github.com/aws/aws-sdk-go-v2/service/route53 v1.41.0 github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.0 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0 diff --git a/go.sum b/go.sum index cfcd83a97c1..aa52b8f11d6 100644 --- a/go.sum +++ b/go.sum @@ -336,8 +336,8 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.1 h1:aR4MioMW7hiNGTcoz github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.1/go.mod h1:gCiBxW2zE+VgC/gSU5a0gteSBjqo3uS906dLJoQgItw= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1 h1:73im9DnuBD4+G8hHsbqb0NSA+n6QJ5ApFk6/YeOz8k8= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1/go.mod h1:p5FuKT8Rj4fnlT84Pzy7itV11NZ39Fwm/Y52S8Lg1Oc= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.0 h1:PkRTzjDe1p4NjpF3jlexR8SqYse7FCZ9F2irAFT4/RY= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.0/go.mod h1:GGzMuBJGT+INpSiVyJDD/SP87wRW+Nj1lEFSp9tyhxk= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.1 h1:jdwVopS0EMYP6xs/BxSW6iOkchLUHI4Le93HEMX5v8A= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.1/go.mod h1:cPPSRXGdLg1+Fguh3QNNOyXfic3QtIQllMs+GAIX5ic= github.com/aws/aws-sdk-go-v2/service/route53 v1.41.0 h1:tvIBVabBmCMZvPFtT18HQbSjskzVEcSvdJIAjLQmP78= github.com/aws/aws-sdk-go-v2/service/route53 v1.41.0/go.mod h1:rJl5QZ1ntzfPi2g3u1p8LQk78tbKj0JNmaNG1a9u97A= github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.0 h1:oJ2TcKRuwWuFwbwCH/ocaLP3EpCTca4B0wqNb6PopKE= From eb94a9b22e27e200a7d4d2d33f049fe8dccc79a8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:07 -0400 Subject: [PATCH 166/208] go get github.com/aws/aws-sdk-go-v2/service/route53. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 81a6ea90b8a..e60c179e3bf 100644 --- a/go.mod +++ b/go.mod @@ -154,7 +154,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.1 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.1 - github.com/aws/aws-sdk-go-v2/service/route53 v1.41.0 + github.com/aws/aws-sdk-go-v2/service/route53 v1.41.1 github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.0 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0 github.com/aws/aws-sdk-go-v2/service/rum v1.18.0 diff --git a/go.sum b/go.sum index aa52b8f11d6..6de407a8e4f 100644 --- a/go.sum +++ b/go.sum @@ -338,8 +338,8 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1 h1:73im9Dn github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1/go.mod h1:p5FuKT8Rj4fnlT84Pzy7itV11NZ39Fwm/Y52S8Lg1Oc= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.1 h1:jdwVopS0EMYP6xs/BxSW6iOkchLUHI4Le93HEMX5v8A= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.1/go.mod h1:cPPSRXGdLg1+Fguh3QNNOyXfic3QtIQllMs+GAIX5ic= -github.com/aws/aws-sdk-go-v2/service/route53 v1.41.0 h1:tvIBVabBmCMZvPFtT18HQbSjskzVEcSvdJIAjLQmP78= -github.com/aws/aws-sdk-go-v2/service/route53 v1.41.0/go.mod h1:rJl5QZ1ntzfPi2g3u1p8LQk78tbKj0JNmaNG1a9u97A= +github.com/aws/aws-sdk-go-v2/service/route53 v1.41.1 h1:8evgBTGIqkBj8zWFZrjBExvC1/3Bgod5EHsmwmnHEy4= +github.com/aws/aws-sdk-go-v2/service/route53 v1.41.1/go.mod h1:aIGJVylrqjjBnf2NU2O1oHOOoBDFvHw6hy/GhelYksQ= github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.0 h1:oJ2TcKRuwWuFwbwCH/ocaLP3EpCTca4B0wqNb6PopKE= github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.0/go.mod h1:L2ps9ionyOaplG4vh51jyIRUK+xB7vjMqnObxXsRoK0= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0 h1:+RSaYW0xatoiE7wGJDcgwRjfZt++9GLWzQGExrCsfDI= From e019018d76a3beb07eed2964b75bf0f4b5f3b16e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:08 -0400 Subject: [PATCH 167/208] go get github.com/aws/aws-sdk-go-v2/service/route53domains. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e60c179e3bf..c2422b90ee5 100644 --- a/go.mod +++ b/go.mod @@ -155,7 +155,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.1 github.com/aws/aws-sdk-go-v2/service/route53 v1.41.1 - github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.0 + github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.1 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0 github.com/aws/aws-sdk-go-v2/service/rum v1.18.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 diff --git a/go.sum b/go.sum index 6de407a8e4f..e36869d16e9 100644 --- a/go.sum +++ b/go.sum @@ -340,8 +340,8 @@ github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.1 h1:jdwVopS0EMYP6xs/Bx github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.1/go.mod h1:cPPSRXGdLg1+Fguh3QNNOyXfic3QtIQllMs+GAIX5ic= github.com/aws/aws-sdk-go-v2/service/route53 v1.41.1 h1:8evgBTGIqkBj8zWFZrjBExvC1/3Bgod5EHsmwmnHEy4= github.com/aws/aws-sdk-go-v2/service/route53 v1.41.1/go.mod h1:aIGJVylrqjjBnf2NU2O1oHOOoBDFvHw6hy/GhelYksQ= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.0 h1:oJ2TcKRuwWuFwbwCH/ocaLP3EpCTca4B0wqNb6PopKE= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.0/go.mod h1:L2ps9ionyOaplG4vh51jyIRUK+xB7vjMqnObxXsRoK0= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.1 h1:G1w6P2mCgHTsLLjiUAADion/UFrbeSMEAiIpuQZnXQs= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.1/go.mod h1:c9sryrQoAKXDmxmV4D+5Tfcczro2hDyt93xqoht4KeM= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0 h1:+RSaYW0xatoiE7wGJDcgwRjfZt++9GLWzQGExrCsfDI= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0/go.mod h1:b93TJwGXxTHjsiJ0atSd1B1SS+t+f0reUP1NpSm5pCY= github.com/aws/aws-sdk-go-v2/service/rum v1.18.0 h1:nSB1+P1J8uhiktco2Q2YHS6QKnmvUTMxLQsi8ToV6fA= From de81327c6704f9d897a079d5ee49d7b53d6e0909 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:09 -0400 Subject: [PATCH 168/208] go get github.com/aws/aws-sdk-go-v2/service/route53profiles. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c2422b90ee5..558ed8f80e8 100644 --- a/go.mod +++ b/go.mod @@ -156,7 +156,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.1 github.com/aws/aws-sdk-go-v2/service/route53 v1.41.1 github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.1 - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0 + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.1 github.com/aws/aws-sdk-go-v2/service/rum v1.18.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 github.com/aws/aws-sdk-go-v2/service/s3control v1.45.0 diff --git a/go.sum b/go.sum index e36869d16e9..3e00ccde832 100644 --- a/go.sum +++ b/go.sum @@ -342,8 +342,8 @@ github.com/aws/aws-sdk-go-v2/service/route53 v1.41.1 h1:8evgBTGIqkBj8zWFZrjBExvC github.com/aws/aws-sdk-go-v2/service/route53 v1.41.1/go.mod h1:aIGJVylrqjjBnf2NU2O1oHOOoBDFvHw6hy/GhelYksQ= github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.1 h1:G1w6P2mCgHTsLLjiUAADion/UFrbeSMEAiIpuQZnXQs= github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.1/go.mod h1:c9sryrQoAKXDmxmV4D+5Tfcczro2hDyt93xqoht4KeM= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0 h1:+RSaYW0xatoiE7wGJDcgwRjfZt++9GLWzQGExrCsfDI= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0/go.mod h1:b93TJwGXxTHjsiJ0atSd1B1SS+t+f0reUP1NpSm5pCY= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.1 h1:TK06zMXS9HYhqlBogMcUKorOl/13WaYtu0iD+6PQeJI= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.1/go.mod h1:cIiUrh4zaUDalfCK/INCBLTrM+RrISQioyShnlQPy58= github.com/aws/aws-sdk-go-v2/service/rum v1.18.0 h1:nSB1+P1J8uhiktco2Q2YHS6QKnmvUTMxLQsi8ToV6fA= github.com/aws/aws-sdk-go-v2/service/rum v1.18.0/go.mod h1:uF2wf6A021PjiTu0/JUkme349nPtPSYHHtxlustC4QI= github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 h1:wsg9Z/vNnCmxWikfGIoOlnExtEU459cR+2d+iDJ8elo= From 4bfeb2af52288c465c6a35e6fdcbea5c08db93c8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:10 -0400 Subject: [PATCH 169/208] go get github.com/aws/aws-sdk-go-v2/service/rum. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 558ed8f80e8..e2ff46023c6 100644 --- a/go.mod +++ b/go.mod @@ -157,7 +157,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53 v1.41.1 github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.1 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.1 - github.com/aws/aws-sdk-go-v2/service/rum v1.18.0 + github.com/aws/aws-sdk-go-v2/service/rum v1.18.1 github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 github.com/aws/aws-sdk-go-v2/service/s3control v1.45.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.0 diff --git a/go.sum b/go.sum index 3e00ccde832..f41b3d24b15 100644 --- a/go.sum +++ b/go.sum @@ -344,8 +344,8 @@ github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.1 h1:G1w6P2mCgHTsLLjiU github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.1/go.mod h1:c9sryrQoAKXDmxmV4D+5Tfcczro2hDyt93xqoht4KeM= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.1 h1:TK06zMXS9HYhqlBogMcUKorOl/13WaYtu0iD+6PQeJI= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.1/go.mod h1:cIiUrh4zaUDalfCK/INCBLTrM+RrISQioyShnlQPy58= -github.com/aws/aws-sdk-go-v2/service/rum v1.18.0 h1:nSB1+P1J8uhiktco2Q2YHS6QKnmvUTMxLQsi8ToV6fA= -github.com/aws/aws-sdk-go-v2/service/rum v1.18.0/go.mod h1:uF2wf6A021PjiTu0/JUkme349nPtPSYHHtxlustC4QI= +github.com/aws/aws-sdk-go-v2/service/rum v1.18.1 h1:YvOEWP/vJSdtWOzJ6JVkdUNBMb0pGuCaKtFMQ1pT0uQ= +github.com/aws/aws-sdk-go-v2/service/rum v1.18.1/go.mod h1:SRAqBhlI73DxLJk++4NzMaTk08X8Ko1cTmLxo6Jencs= github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 h1:wsg9Z/vNnCmxWikfGIoOlnExtEU459cR+2d+iDJ8elo= github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1/go.mod h1:8rDw3mVwmvIWWX/+LWY3PPIMZuwnQdJMCt0iVFVT3qw= github.com/aws/aws-sdk-go-v2/service/s3control v1.45.0 h1:pY/fn04jwUb3WfjWNNGdt3uAT7ZwBx/qz4S5gKWvfpc= From c6914bcda9d9529992861cbd9344842248af9286 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:11 -0400 Subject: [PATCH 170/208] go get github.com/aws/aws-sdk-go-v2/service/s3control. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e2ff46023c6..6dae74baff6 100644 --- a/go.mod +++ b/go.mod @@ -159,7 +159,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.1 github.com/aws/aws-sdk-go-v2/service/rum v1.18.1 github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 - github.com/aws/aws-sdk-go-v2/service/s3control v1.45.0 + github.com/aws/aws-sdk-go-v2/service/s3control v1.45.1 github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.0 github.com/aws/aws-sdk-go-v2/service/schemas v1.25.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.0 diff --git a/go.sum b/go.sum index f41b3d24b15..5360fb55491 100644 --- a/go.sum +++ b/go.sum @@ -348,8 +348,8 @@ github.com/aws/aws-sdk-go-v2/service/rum v1.18.1 h1:YvOEWP/vJSdtWOzJ6JVkdUNBMb0p github.com/aws/aws-sdk-go-v2/service/rum v1.18.1/go.mod h1:SRAqBhlI73DxLJk++4NzMaTk08X8Ko1cTmLxo6Jencs= github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 h1:wsg9Z/vNnCmxWikfGIoOlnExtEU459cR+2d+iDJ8elo= github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1/go.mod h1:8rDw3mVwmvIWWX/+LWY3PPIMZuwnQdJMCt0iVFVT3qw= -github.com/aws/aws-sdk-go-v2/service/s3control v1.45.0 h1:pY/fn04jwUb3WfjWNNGdt3uAT7ZwBx/qz4S5gKWvfpc= -github.com/aws/aws-sdk-go-v2/service/s3control v1.45.0/go.mod h1:6cnOOx7AsrCBX6NlwKmGYi5fz385yqFJxQwBGMDyc6A= +github.com/aws/aws-sdk-go-v2/service/s3control v1.45.1 h1:ZLpS2OLxDU5kJmsORex4Iyd/1v386lW6U6tI3dg38yU= +github.com/aws/aws-sdk-go-v2/service/s3control v1.45.1/go.mod h1:D3MZ3krIqgoG3twJxe/NfHatuUiQ+Qp76TEqrX7K4pY= github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.0 h1:rS3lP/TQoPU2rnw3edOtSkvTtOQox64KAeTuArky5cg= github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.0/go.mod h1:iq8U67MA8PgyLvjYbALIXJTtEazl1nnlJOlfxKx7VkA= github.com/aws/aws-sdk-go-v2/service/schemas v1.25.0 h1:i4RLQp/sF2ej3Mf+ylkSWsjQ+LNZehcGpb+di3JZ9ac= From 27eafa7b6828a4fbd2050e479f02e53185f33415 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:12 -0400 Subject: [PATCH 171/208] go get github.com/aws/aws-sdk-go-v2/service/scheduler. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6dae74baff6..00ef119ab28 100644 --- a/go.mod +++ b/go.mod @@ -160,7 +160,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rum v1.18.1 github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 github.com/aws/aws-sdk-go-v2/service/s3control v1.45.1 - github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.0 + github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.1 github.com/aws/aws-sdk-go-v2/service/schemas v1.25.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.0 github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.0 diff --git a/go.sum b/go.sum index 5360fb55491..2a3a8073a5f 100644 --- a/go.sum +++ b/go.sum @@ -350,8 +350,8 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 h1:wsg9Z/vNnCmxWikfGIoOlnExtEU45 github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1/go.mod h1:8rDw3mVwmvIWWX/+LWY3PPIMZuwnQdJMCt0iVFVT3qw= github.com/aws/aws-sdk-go-v2/service/s3control v1.45.1 h1:ZLpS2OLxDU5kJmsORex4Iyd/1v386lW6U6tI3dg38yU= github.com/aws/aws-sdk-go-v2/service/s3control v1.45.1/go.mod h1:D3MZ3krIqgoG3twJxe/NfHatuUiQ+Qp76TEqrX7K4pY= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.0 h1:rS3lP/TQoPU2rnw3edOtSkvTtOQox64KAeTuArky5cg= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.0/go.mod h1:iq8U67MA8PgyLvjYbALIXJTtEazl1nnlJOlfxKx7VkA= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.1 h1:A46/5P4BsP3XUqm+ehaa3GzdqSUm63hElZkZjv60pto= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.1/go.mod h1:YR4bk2KhPbe9Ryes7kRZ/U3kRX6DdfS6xFfUc7RGj5Q= github.com/aws/aws-sdk-go-v2/service/schemas v1.25.0 h1:i4RLQp/sF2ej3Mf+ylkSWsjQ+LNZehcGpb+di3JZ9ac= github.com/aws/aws-sdk-go-v2/service/schemas v1.25.0/go.mod h1:h7U1z78PLCbVBZyHNFrrnQaLsBl5jS9HBFKZUfyAY+M= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.0 h1:ZyB15ar3Z+zYlFbg0p9cRwu8MjanG70q+wR8/QI/Ehw= From 5dc30984ae5b033e2c58802ee9012a4176423d73 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:13 -0400 Subject: [PATCH 172/208] go get github.com/aws/aws-sdk-go-v2/service/schemas. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 00ef119ab28..0affe9711f2 100644 --- a/go.mod +++ b/go.mod @@ -161,7 +161,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 github.com/aws/aws-sdk-go-v2/service/s3control v1.45.1 github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.1 - github.com/aws/aws-sdk-go-v2/service/schemas v1.25.0 + github.com/aws/aws-sdk-go-v2/service/schemas v1.25.1 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.0 github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.0 github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.0 diff --git a/go.sum b/go.sum index 2a3a8073a5f..d48a2596222 100644 --- a/go.sum +++ b/go.sum @@ -352,8 +352,8 @@ github.com/aws/aws-sdk-go-v2/service/s3control v1.45.1 h1:ZLpS2OLxDU5kJmsORex4Iy github.com/aws/aws-sdk-go-v2/service/s3control v1.45.1/go.mod h1:D3MZ3krIqgoG3twJxe/NfHatuUiQ+Qp76TEqrX7K4pY= github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.1 h1:A46/5P4BsP3XUqm+ehaa3GzdqSUm63hElZkZjv60pto= github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.1/go.mod h1:YR4bk2KhPbe9Ryes7kRZ/U3kRX6DdfS6xFfUc7RGj5Q= -github.com/aws/aws-sdk-go-v2/service/schemas v1.25.0 h1:i4RLQp/sF2ej3Mf+ylkSWsjQ+LNZehcGpb+di3JZ9ac= -github.com/aws/aws-sdk-go-v2/service/schemas v1.25.0/go.mod h1:h7U1z78PLCbVBZyHNFrrnQaLsBl5jS9HBFKZUfyAY+M= +github.com/aws/aws-sdk-go-v2/service/schemas v1.25.1 h1:2qFVrrqZxRQVxuZ/2nnpLvm9mRAELSQWczpbt7oR62c= +github.com/aws/aws-sdk-go-v2/service/schemas v1.25.1/go.mod h1:kyEvFeyc6CvoylCMY2yXBWnsqKs3TLc3QY2Bt70Wk2A= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.0 h1:ZyB15ar3Z+zYlFbg0p9cRwu8MjanG70q+wR8/QI/Ehw= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.0/go.mod h1:hLeitfWsmqj2EFJWsXyz4GSpqG/aqrHXSd4lCH0q07U= github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.0 h1:DjIkaU2Y4kwx3steK44v6zoo5BNS5BWq/CK6VeFXVOQ= From 875037f07fc49ef5eb7daf3c41acced2887bcb9a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:14 -0400 Subject: [PATCH 173/208] go get github.com/aws/aws-sdk-go-v2/service/secretsmanager. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0affe9711f2..d5ee036a82d 100644 --- a/go.mod +++ b/go.mod @@ -162,7 +162,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3control v1.45.1 github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.1 github.com/aws/aws-sdk-go-v2/service/schemas v1.25.1 - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.0 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1 github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.0 github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.0 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.0 diff --git a/go.sum b/go.sum index d48a2596222..9c38096e8fd 100644 --- a/go.sum +++ b/go.sum @@ -354,8 +354,8 @@ github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.1 h1:A46/5P4BsP3XUqm+ehaa3Gz github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.1/go.mod h1:YR4bk2KhPbe9Ryes7kRZ/U3kRX6DdfS6xFfUc7RGj5Q= github.com/aws/aws-sdk-go-v2/service/schemas v1.25.1 h1:2qFVrrqZxRQVxuZ/2nnpLvm9mRAELSQWczpbt7oR62c= github.com/aws/aws-sdk-go-v2/service/schemas v1.25.1/go.mod h1:kyEvFeyc6CvoylCMY2yXBWnsqKs3TLc3QY2Bt70Wk2A= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.0 h1:ZyB15ar3Z+zYlFbg0p9cRwu8MjanG70q+wR8/QI/Ehw= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.0/go.mod h1:hLeitfWsmqj2EFJWsXyz4GSpqG/aqrHXSd4lCH0q07U= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1 h1:fMhrWVym3nTAcf3eT9XsYcfN1kgQ/7ZuVLGHjPAn6Ms= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1/go.mod h1:tBCf2+VgRT/Lk9KIlKpTxyCunzxHcP8BFPqcck5I9mM= github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.0 h1:DjIkaU2Y4kwx3steK44v6zoo5BNS5BWq/CK6VeFXVOQ= github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.0/go.mod h1:OgnzWiYEqZl+wyDa3tNNLjodrEQoHATqSsf5retzEsk= github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.0 h1:h0Hc0HeqRiCdQNxFuN5/T6Dyk8WmJ41ys42ikIRBozM= From b52b4330f357bf04aa7804d719f2e83b23c81d40 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:14 -0400 Subject: [PATCH 174/208] go get github.com/aws/aws-sdk-go-v2/service/securityhub. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d5ee036a82d..6305e7dd3af 100644 --- a/go.mod +++ b/go.mod @@ -163,7 +163,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.1 github.com/aws/aws-sdk-go-v2/service/schemas v1.25.1 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1 - github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.0 + github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.1 github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.0 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.0 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.0 diff --git a/go.sum b/go.sum index 9c38096e8fd..37c34525f3d 100644 --- a/go.sum +++ b/go.sum @@ -356,8 +356,8 @@ github.com/aws/aws-sdk-go-v2/service/schemas v1.25.1 h1:2qFVrrqZxRQVxuZ/2nnpLvm9 github.com/aws/aws-sdk-go-v2/service/schemas v1.25.1/go.mod h1:kyEvFeyc6CvoylCMY2yXBWnsqKs3TLc3QY2Bt70Wk2A= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1 h1:fMhrWVym3nTAcf3eT9XsYcfN1kgQ/7ZuVLGHjPAn6Ms= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1/go.mod h1:tBCf2+VgRT/Lk9KIlKpTxyCunzxHcP8BFPqcck5I9mM= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.0 h1:DjIkaU2Y4kwx3steK44v6zoo5BNS5BWq/CK6VeFXVOQ= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.0/go.mod h1:OgnzWiYEqZl+wyDa3tNNLjodrEQoHATqSsf5retzEsk= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.1 h1:kT/0nz4Fgb7/xZpIUubXmFrNQHQ4KPaBA2ebGGCE2F4= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.1/go.mod h1:0eCNhMYahG4Yj7uBDm9BTq8KoLmBmhxt4d36PfZ/uPU= github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.0 h1:h0Hc0HeqRiCdQNxFuN5/T6Dyk8WmJ41ys42ikIRBozM= github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.0/go.mod h1:80i7dDYRHz+6goSHA9aYAAKLsAgF/YG45mtBkQXLu9I= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.0 h1:McGMz1MxHynEh00FRagW/NbSf6JjW6XtSBky4DWSeWg= From 5498061f04a3655d23b55a9964fb9a2ac92bb1e0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:15 -0400 Subject: [PATCH 175/208] go get github.com/aws/aws-sdk-go-v2/service/securitylake. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6305e7dd3af..84725ddb87f 100644 --- a/go.mod +++ b/go.mod @@ -164,7 +164,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/schemas v1.25.1 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1 github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.1 - github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.0 + github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.1 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.0 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.0 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.0 diff --git a/go.sum b/go.sum index 37c34525f3d..55236d11ce4 100644 --- a/go.sum +++ b/go.sum @@ -358,8 +358,8 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1 h1:fMhrWVym3nTAcf3eT github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1/go.mod h1:tBCf2+VgRT/Lk9KIlKpTxyCunzxHcP8BFPqcck5I9mM= github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.1 h1:kT/0nz4Fgb7/xZpIUubXmFrNQHQ4KPaBA2ebGGCE2F4= github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.1/go.mod h1:0eCNhMYahG4Yj7uBDm9BTq8KoLmBmhxt4d36PfZ/uPU= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.0 h1:h0Hc0HeqRiCdQNxFuN5/T6Dyk8WmJ41ys42ikIRBozM= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.0/go.mod h1:80i7dDYRHz+6goSHA9aYAAKLsAgF/YG45mtBkQXLu9I= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.1 h1:vTyA6riZZ7n7qI0vlNHaXgqv8D5oiRCuHwEj1gd1soM= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.1/go.mod h1:GPJabMy3AdBJjL6YRzu3LNbw+11OuvzZwjmMpmZhkjg= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.0 h1:McGMz1MxHynEh00FRagW/NbSf6JjW6XtSBky4DWSeWg= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.0/go.mod h1:LpcM0C8kqecwfaNeK7yRlyOt0gLuzCYwKcnK39ADOsI= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.0 h1:FCRBlq0ym8/3kr5/tQKLg7tsz5nTOmdqtArNWdvAdNA= From 79557016547a648b0a211aae0de4a008d1ddd815 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:16 -0400 Subject: [PATCH 176/208] go get github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 84725ddb87f..79a81f18e19 100644 --- a/go.mod +++ b/go.mod @@ -165,7 +165,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1 github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.1 github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.1 - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.0 + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.1 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.0 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.0 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.0 diff --git a/go.sum b/go.sum index 55236d11ce4..f383c79ae4c 100644 --- a/go.sum +++ b/go.sum @@ -360,8 +360,8 @@ github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.1 h1:kT/0nz4Fgb7/xZpIUubX github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.1/go.mod h1:0eCNhMYahG4Yj7uBDm9BTq8KoLmBmhxt4d36PfZ/uPU= github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.1 h1:vTyA6riZZ7n7qI0vlNHaXgqv8D5oiRCuHwEj1gd1soM= github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.1/go.mod h1:GPJabMy3AdBJjL6YRzu3LNbw+11OuvzZwjmMpmZhkjg= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.0 h1:McGMz1MxHynEh00FRagW/NbSf6JjW6XtSBky4DWSeWg= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.0/go.mod h1:LpcM0C8kqecwfaNeK7yRlyOt0gLuzCYwKcnK39ADOsI= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.1 h1:WJR9PhUdNULh+L+C/ByCFFB8ldkTfj4c9HKiWV+esgk= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.1/go.mod h1:VHl0eZ8oYU2D0/BeBYTO5bJ6V1riuxCBQGEAjF+6Jx0= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.0 h1:FCRBlq0ym8/3kr5/tQKLg7tsz5nTOmdqtArNWdvAdNA= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.0/go.mod h1:w6z+TqchBg7RF3FtvUGs08faCSYfwlbGf7x5ipuWDKU= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.0 h1:J1RxKkbJvOydBLiNGR1T5HUjJ+Qjmh+n4p+V7Cpkhn8= From 49303b16ae3bb409ccab433c07d55ae2b6fe786d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:17 -0400 Subject: [PATCH 177/208] go get github.com/aws/aws-sdk-go-v2/service/servicediscovery. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 79a81f18e19..439e61315b4 100644 --- a/go.mod +++ b/go.mod @@ -166,7 +166,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.1 github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.1 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.1 - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.0 + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.1 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.0 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.0 github.com/aws/aws-sdk-go-v2/service/shield v1.26.0 diff --git a/go.sum b/go.sum index f383c79ae4c..0f3ea171419 100644 --- a/go.sum +++ b/go.sum @@ -362,8 +362,8 @@ github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.1 h1:vTyA6riZZ7n7qI0vlNH github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.1/go.mod h1:GPJabMy3AdBJjL6YRzu3LNbw+11OuvzZwjmMpmZhkjg= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.1 h1:WJR9PhUdNULh+L+C/ByCFFB8ldkTfj4c9HKiWV+esgk= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.1/go.mod h1:VHl0eZ8oYU2D0/BeBYTO5bJ6V1riuxCBQGEAjF+6Jx0= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.0 h1:FCRBlq0ym8/3kr5/tQKLg7tsz5nTOmdqtArNWdvAdNA= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.0/go.mod h1:w6z+TqchBg7RF3FtvUGs08faCSYfwlbGf7x5ipuWDKU= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.1 h1:N19/J0IqsoNlkbXLe+JYWLjOyGmRijt6dw0+MaL/9wE= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.1/go.mod h1:uuMsqZ2ATDqrzaAldWWuEUd9KGqi1NmnjroG6Eoe7W4= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.0 h1:J1RxKkbJvOydBLiNGR1T5HUjJ+Qjmh+n4p+V7Cpkhn8= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.0/go.mod h1:XnoYordEM2qP1jnnHqMsm55wgdm0VubxjUu3UKiB6ZE= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.0 h1:nDUPSj4veXxQuuX2khp5rW3bvyZZPnB0LGiNjSKz3Jo= From eada22e4ee2148c2826b6454af2dabe0db90d585 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:17 -0400 Subject: [PATCH 178/208] go get github.com/aws/aws-sdk-go-v2/service/servicequotas. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 439e61315b4..fe5f3f92593 100644 --- a/go.mod +++ b/go.mod @@ -167,7 +167,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.1 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.1 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.1 - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.0 + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.0 github.com/aws/aws-sdk-go-v2/service/shield v1.26.0 github.com/aws/aws-sdk-go-v2/service/signer v1.23.0 diff --git a/go.sum b/go.sum index 0f3ea171419..e3f28feeea6 100644 --- a/go.sum +++ b/go.sum @@ -364,8 +364,8 @@ github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.1 h1:WJR9Ph github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.1/go.mod h1:VHl0eZ8oYU2D0/BeBYTO5bJ6V1riuxCBQGEAjF+6Jx0= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.1 h1:N19/J0IqsoNlkbXLe+JYWLjOyGmRijt6dw0+MaL/9wE= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.1/go.mod h1:uuMsqZ2ATDqrzaAldWWuEUd9KGqi1NmnjroG6Eoe7W4= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.0 h1:J1RxKkbJvOydBLiNGR1T5HUjJ+Qjmh+n4p+V7Cpkhn8= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.0/go.mod h1:XnoYordEM2qP1jnnHqMsm55wgdm0VubxjUu3UKiB6ZE= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1 h1:QsHvqtdy0mGzpg/A+1lZX1ilf05Vuh2rSBzNJ3f3T1I= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1/go.mod h1:PyGv4oTed21K85Eu27j4u/8QyMlMHI0MivoNzziG6fg= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.0 h1:nDUPSj4veXxQuuX2khp5rW3bvyZZPnB0LGiNjSKz3Jo= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.0/go.mod h1:xpE4aMOs0Lby0U2ymdxGdON1soWCmqK8wOIWBgb4BZ4= github.com/aws/aws-sdk-go-v2/service/shield v1.26.0 h1:SgqIGzWtN2CY53hi36SVmZ4Ygtu6b/E2LETPpnvarfQ= From 3048fb9740533ddd80f664a78918d49032f06f84 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:18 -0400 Subject: [PATCH 179/208] go get github.com/aws/aws-sdk-go-v2/service/sesv2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fe5f3f92593..34f2b677184 100644 --- a/go.mod +++ b/go.mod @@ -168,7 +168,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.1 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.1 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1 - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.0 + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.1 github.com/aws/aws-sdk-go-v2/service/shield v1.26.0 github.com/aws/aws-sdk-go-v2/service/signer v1.23.0 github.com/aws/aws-sdk-go-v2/service/sns v1.30.0 diff --git a/go.sum b/go.sum index e3f28feeea6..c7453990337 100644 --- a/go.sum +++ b/go.sum @@ -366,8 +366,8 @@ github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.1 h1:N19/J0IqsoNlkbX github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.1/go.mod h1:uuMsqZ2ATDqrzaAldWWuEUd9KGqi1NmnjroG6Eoe7W4= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1 h1:QsHvqtdy0mGzpg/A+1lZX1ilf05Vuh2rSBzNJ3f3T1I= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1/go.mod h1:PyGv4oTed21K85Eu27j4u/8QyMlMHI0MivoNzziG6fg= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.0 h1:nDUPSj4veXxQuuX2khp5rW3bvyZZPnB0LGiNjSKz3Jo= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.0/go.mod h1:xpE4aMOs0Lby0U2ymdxGdON1soWCmqK8wOIWBgb4BZ4= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.1 h1:Bz5SPXOgdFOs0y+zt0KoqyAweD6UrOSQ0trsLCulttQ= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.1/go.mod h1:uwzHo1t7tjKs3mo+X9wAMis1rCp23oGR4zXfKROKv28= github.com/aws/aws-sdk-go-v2/service/shield v1.26.0 h1:SgqIGzWtN2CY53hi36SVmZ4Ygtu6b/E2LETPpnvarfQ= github.com/aws/aws-sdk-go-v2/service/shield v1.26.0/go.mod h1:WRG9BjqyyYMcN8Z+MpQDdE1qDdEn0YtLxksG60UJDjA= github.com/aws/aws-sdk-go-v2/service/signer v1.23.0 h1:RCoquPxZDbw6PJV5rgV04HgcOPSja1RDMcJf36Ssnlc= From 15632ba103b40f0d62ca8d17ccbc998b6a131daa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:19 -0400 Subject: [PATCH 180/208] go get github.com/aws/aws-sdk-go-v2/service/shield. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 34f2b677184..8d84cb190e0 100644 --- a/go.mod +++ b/go.mod @@ -169,7 +169,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.1 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.1 - github.com/aws/aws-sdk-go-v2/service/shield v1.26.0 + github.com/aws/aws-sdk-go-v2/service/shield v1.26.1 github.com/aws/aws-sdk-go-v2/service/signer v1.23.0 github.com/aws/aws-sdk-go-v2/service/sns v1.30.0 github.com/aws/aws-sdk-go-v2/service/sqs v1.33.0 diff --git a/go.sum b/go.sum index c7453990337..cb5dc692a61 100644 --- a/go.sum +++ b/go.sum @@ -368,8 +368,8 @@ github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1 h1:QsHvqtdy0mGzpg/A+1 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1/go.mod h1:PyGv4oTed21K85Eu27j4u/8QyMlMHI0MivoNzziG6fg= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.1 h1:Bz5SPXOgdFOs0y+zt0KoqyAweD6UrOSQ0trsLCulttQ= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.1/go.mod h1:uwzHo1t7tjKs3mo+X9wAMis1rCp23oGR4zXfKROKv28= -github.com/aws/aws-sdk-go-v2/service/shield v1.26.0 h1:SgqIGzWtN2CY53hi36SVmZ4Ygtu6b/E2LETPpnvarfQ= -github.com/aws/aws-sdk-go-v2/service/shield v1.26.0/go.mod h1:WRG9BjqyyYMcN8Z+MpQDdE1qDdEn0YtLxksG60UJDjA= +github.com/aws/aws-sdk-go-v2/service/shield v1.26.1 h1:vlqoPRFrhs/djRKnrPNJvzzVLIsMWITGgP4gHIzprSU= +github.com/aws/aws-sdk-go-v2/service/shield v1.26.1/go.mod h1:1aUTOI7FTFp3ng7NH3C0UqDkbofoLb7NLcd/ufvlHdY= github.com/aws/aws-sdk-go-v2/service/signer v1.23.0 h1:RCoquPxZDbw6PJV5rgV04HgcOPSja1RDMcJf36Ssnlc= github.com/aws/aws-sdk-go-v2/service/signer v1.23.0/go.mod h1:cMnMMZdfAEsZ1XeUOYC3rKFnK3a6G53qiAljLUvbuOc= github.com/aws/aws-sdk-go-v2/service/sns v1.30.0 h1:Xq0gjRipdyccCsbojaEGsqUzD7N8j/911+ga/mS/KOs= From 95117394caac4e2553babdc6f436cf7180b19545 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:20 -0400 Subject: [PATCH 181/208] go get github.com/aws/aws-sdk-go-v2/service/signer. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8d84cb190e0..cb537bd4457 100644 --- a/go.mod +++ b/go.mod @@ -170,7 +170,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.1 github.com/aws/aws-sdk-go-v2/service/shield v1.26.1 - github.com/aws/aws-sdk-go-v2/service/signer v1.23.0 + github.com/aws/aws-sdk-go-v2/service/signer v1.23.1 github.com/aws/aws-sdk-go-v2/service/sns v1.30.0 github.com/aws/aws-sdk-go-v2/service/sqs v1.33.0 github.com/aws/aws-sdk-go-v2/service/ssm v1.51.0 diff --git a/go.sum b/go.sum index cb5dc692a61..c79c98db621 100644 --- a/go.sum +++ b/go.sum @@ -370,8 +370,8 @@ github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.1 h1:Bz5SPXOgdFOs0y+zt0KoqyAweD github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.1/go.mod h1:uwzHo1t7tjKs3mo+X9wAMis1rCp23oGR4zXfKROKv28= github.com/aws/aws-sdk-go-v2/service/shield v1.26.1 h1:vlqoPRFrhs/djRKnrPNJvzzVLIsMWITGgP4gHIzprSU= github.com/aws/aws-sdk-go-v2/service/shield v1.26.1/go.mod h1:1aUTOI7FTFp3ng7NH3C0UqDkbofoLb7NLcd/ufvlHdY= -github.com/aws/aws-sdk-go-v2/service/signer v1.23.0 h1:RCoquPxZDbw6PJV5rgV04HgcOPSja1RDMcJf36Ssnlc= -github.com/aws/aws-sdk-go-v2/service/signer v1.23.0/go.mod h1:cMnMMZdfAEsZ1XeUOYC3rKFnK3a6G53qiAljLUvbuOc= +github.com/aws/aws-sdk-go-v2/service/signer v1.23.1 h1:H91003y5gB7UfahQ58w6GeMZfiNPTxTarpNj8fAJvfc= +github.com/aws/aws-sdk-go-v2/service/signer v1.23.1/go.mod h1:KaQ1Ix0kfyv+PTMN9u3/+VRUeAMi59yzMpTkbQPXNr0= github.com/aws/aws-sdk-go-v2/service/sns v1.30.0 h1:Xq0gjRipdyccCsbojaEGsqUzD7N8j/911+ga/mS/KOs= github.com/aws/aws-sdk-go-v2/service/sns v1.30.0/go.mod h1:2VCr8FDGRUdGmTpcKWHyziQnfgJo0ToZYvFflybzxAg= github.com/aws/aws-sdk-go-v2/service/sqs v1.33.0 h1:7iapmBjPo27AGV5MnJZK9xN2TDScmy9YqYGBb0+9rQA= From df6e0d857bdcdebb97c25b204e68fecb5d53d696 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:21 -0400 Subject: [PATCH 182/208] go get github.com/aws/aws-sdk-go-v2/service/sns. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cb537bd4457..942f3aa9871 100644 --- a/go.mod +++ b/go.mod @@ -171,7 +171,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.1 github.com/aws/aws-sdk-go-v2/service/shield v1.26.1 github.com/aws/aws-sdk-go-v2/service/signer v1.23.1 - github.com/aws/aws-sdk-go-v2/service/sns v1.30.0 + github.com/aws/aws-sdk-go-v2/service/sns v1.30.1 github.com/aws/aws-sdk-go-v2/service/sqs v1.33.0 github.com/aws/aws-sdk-go-v2/service/ssm v1.51.0 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.0 diff --git a/go.sum b/go.sum index c79c98db621..6bda82c19d0 100644 --- a/go.sum +++ b/go.sum @@ -372,8 +372,8 @@ github.com/aws/aws-sdk-go-v2/service/shield v1.26.1 h1:vlqoPRFrhs/djRKnrPNJvzzVL github.com/aws/aws-sdk-go-v2/service/shield v1.26.1/go.mod h1:1aUTOI7FTFp3ng7NH3C0UqDkbofoLb7NLcd/ufvlHdY= github.com/aws/aws-sdk-go-v2/service/signer v1.23.1 h1:H91003y5gB7UfahQ58w6GeMZfiNPTxTarpNj8fAJvfc= github.com/aws/aws-sdk-go-v2/service/signer v1.23.1/go.mod h1:KaQ1Ix0kfyv+PTMN9u3/+VRUeAMi59yzMpTkbQPXNr0= -github.com/aws/aws-sdk-go-v2/service/sns v1.30.0 h1:Xq0gjRipdyccCsbojaEGsqUzD7N8j/911+ga/mS/KOs= -github.com/aws/aws-sdk-go-v2/service/sns v1.30.0/go.mod h1:2VCr8FDGRUdGmTpcKWHyziQnfgJo0ToZYvFflybzxAg= +github.com/aws/aws-sdk-go-v2/service/sns v1.30.1 h1:49R5Uh0Vi4Y21UHfLzmLmg7hwqQLyBmWqS0Vh+EpV2A= +github.com/aws/aws-sdk-go-v2/service/sns v1.30.1/go.mod h1:khPCTZaFImcuDtOLDqiveVdpQL53OXkK+/yoyao+kzk= github.com/aws/aws-sdk-go-v2/service/sqs v1.33.0 h1:7iapmBjPo27AGV5MnJZK9xN2TDScmy9YqYGBb0+9rQA= github.com/aws/aws-sdk-go-v2/service/sqs v1.33.0/go.mod h1:Ls5D7SrhpvEuUmmQs+cbsguHYQLyeUGHtu0pBl3AqHA= github.com/aws/aws-sdk-go-v2/service/ssm v1.51.0 h1:RJuxHYRQquxK8vDzCKGwSNOPrfZlu8bLRSLKZQXPpT4= From 7f2d7d8569e994f3b282cfdc306c66f1638828be Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:21 -0400 Subject: [PATCH 183/208] go get github.com/aws/aws-sdk-go-v2/service/sqs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 942f3aa9871..50f1d7af189 100644 --- a/go.mod +++ b/go.mod @@ -172,7 +172,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/shield v1.26.1 github.com/aws/aws-sdk-go-v2/service/signer v1.23.1 github.com/aws/aws-sdk-go-v2/service/sns v1.30.1 - github.com/aws/aws-sdk-go-v2/service/sqs v1.33.0 + github.com/aws/aws-sdk-go-v2/service/sqs v1.33.1 github.com/aws/aws-sdk-go-v2/service/ssm v1.51.0 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.0 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0 diff --git a/go.sum b/go.sum index 6bda82c19d0..19fcda1b676 100644 --- a/go.sum +++ b/go.sum @@ -374,8 +374,8 @@ github.com/aws/aws-sdk-go-v2/service/signer v1.23.1 h1:H91003y5gB7UfahQ58w6GeMZf github.com/aws/aws-sdk-go-v2/service/signer v1.23.1/go.mod h1:KaQ1Ix0kfyv+PTMN9u3/+VRUeAMi59yzMpTkbQPXNr0= github.com/aws/aws-sdk-go-v2/service/sns v1.30.1 h1:49R5Uh0Vi4Y21UHfLzmLmg7hwqQLyBmWqS0Vh+EpV2A= github.com/aws/aws-sdk-go-v2/service/sns v1.30.1/go.mod h1:khPCTZaFImcuDtOLDqiveVdpQL53OXkK+/yoyao+kzk= -github.com/aws/aws-sdk-go-v2/service/sqs v1.33.0 h1:7iapmBjPo27AGV5MnJZK9xN2TDScmy9YqYGBb0+9rQA= -github.com/aws/aws-sdk-go-v2/service/sqs v1.33.0/go.mod h1:Ls5D7SrhpvEuUmmQs+cbsguHYQLyeUGHtu0pBl3AqHA= +github.com/aws/aws-sdk-go-v2/service/sqs v1.33.1 h1:m/7a5OgAZQDWJlSbZLWg4BAlbXbY6j+dDDjPY8rZ7kA= +github.com/aws/aws-sdk-go-v2/service/sqs v1.33.1/go.mod h1:4kCM5tMCkys9PFbuGHP+LjpxlsA5oMRUs3QvnWo11BM= github.com/aws/aws-sdk-go-v2/service/ssm v1.51.0 h1:RJuxHYRQquxK8vDzCKGwSNOPrfZlu8bLRSLKZQXPpT4= github.com/aws/aws-sdk-go-v2/service/ssm v1.51.0/go.mod h1:pBcd0Bm+W3KEHKQHtPg7cK9dsP+2gvDaQTYrqXqk194= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.0 h1:wA7oJ7pxznRmpGzrrYIKO8y0n+WIzklHTWBo32iN0OY= From 9756cd70254ccd45791a2de21c7bef5d5c7fe6d5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:22 -0400 Subject: [PATCH 184/208] go get github.com/aws/aws-sdk-go-v2/service/ssm. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 50f1d7af189..39c087212c1 100644 --- a/go.mod +++ b/go.mod @@ -173,7 +173,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/signer v1.23.1 github.com/aws/aws-sdk-go-v2/service/sns v1.30.1 github.com/aws/aws-sdk-go-v2/service/sqs v1.33.1 - github.com/aws/aws-sdk-go-v2/service/ssm v1.51.0 + github.com/aws/aws-sdk-go-v2/service/ssm v1.51.1 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.0 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0 diff --git a/go.sum b/go.sum index 19fcda1b676..5a3ec5eb495 100644 --- a/go.sum +++ b/go.sum @@ -376,8 +376,8 @@ github.com/aws/aws-sdk-go-v2/service/sns v1.30.1 h1:49R5Uh0Vi4Y21UHfLzmLmg7hwqQL github.com/aws/aws-sdk-go-v2/service/sns v1.30.1/go.mod h1:khPCTZaFImcuDtOLDqiveVdpQL53OXkK+/yoyao+kzk= github.com/aws/aws-sdk-go-v2/service/sqs v1.33.1 h1:m/7a5OgAZQDWJlSbZLWg4BAlbXbY6j+dDDjPY8rZ7kA= github.com/aws/aws-sdk-go-v2/service/sqs v1.33.1/go.mod h1:4kCM5tMCkys9PFbuGHP+LjpxlsA5oMRUs3QvnWo11BM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.51.0 h1:RJuxHYRQquxK8vDzCKGwSNOPrfZlu8bLRSLKZQXPpT4= -github.com/aws/aws-sdk-go-v2/service/ssm v1.51.0/go.mod h1:pBcd0Bm+W3KEHKQHtPg7cK9dsP+2gvDaQTYrqXqk194= +github.com/aws/aws-sdk-go-v2/service/ssm v1.51.1 h1:MuFdaoXYgw4CPsiSa2G/T5CGOuSk90lb/eSTa+lRp9I= +github.com/aws/aws-sdk-go-v2/service/ssm v1.51.1/go.mod h1:pC8vyMIahlJIUKdXBto0R+JzoTK7+iEplKqq7DbWodY= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.0 h1:wA7oJ7pxznRmpGzrrYIKO8y0n+WIzklHTWBo32iN0OY= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.0/go.mod h1:xzt1f/KRs/6k/nlcOw34T9CSdPgCi4veERocWz488EM= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0 h1:z9+1A3GPG1fK93uGvonnGNR5IrfGL2uv23FlhqZ5nPc= From c52de3948d7f6aa50a9a9bf97fd08725ca0944cf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:23 -0400 Subject: [PATCH 185/208] go get github.com/aws/aws-sdk-go-v2/service/ssmcontacts. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 39c087212c1..4b60813d7ba 100644 --- a/go.mod +++ b/go.mod @@ -174,7 +174,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sns v1.30.1 github.com/aws/aws-sdk-go-v2/service/sqs v1.33.1 github.com/aws/aws-sdk-go-v2/service/ssm v1.51.1 - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.0 + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.1 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0 github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 diff --git a/go.sum b/go.sum index 5a3ec5eb495..01d6055be9c 100644 --- a/go.sum +++ b/go.sum @@ -378,8 +378,8 @@ github.com/aws/aws-sdk-go-v2/service/sqs v1.33.1 h1:m/7a5OgAZQDWJlSbZLWg4BAlbXbY github.com/aws/aws-sdk-go-v2/service/sqs v1.33.1/go.mod h1:4kCM5tMCkys9PFbuGHP+LjpxlsA5oMRUs3QvnWo11BM= github.com/aws/aws-sdk-go-v2/service/ssm v1.51.1 h1:MuFdaoXYgw4CPsiSa2G/T5CGOuSk90lb/eSTa+lRp9I= github.com/aws/aws-sdk-go-v2/service/ssm v1.51.1/go.mod h1:pC8vyMIahlJIUKdXBto0R+JzoTK7+iEplKqq7DbWodY= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.0 h1:wA7oJ7pxznRmpGzrrYIKO8y0n+WIzklHTWBo32iN0OY= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.0/go.mod h1:xzt1f/KRs/6k/nlcOw34T9CSdPgCi4veERocWz488EM= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.1 h1:a8tzj/cicbel7pGZYjF3JOJRtyLeWYPCzqL2Plr7LM4= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.1/go.mod h1:LBJz2C528vpvnKXpS1lW139rq7ZYnRPkTgm1RcewafU= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0 h1:z9+1A3GPG1fK93uGvonnGNR5IrfGL2uv23FlhqZ5nPc= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0/go.mod h1:/ZlBCvFGploAXe+70lJ5B56ZiFsMJ9dtKjVl2nw1YSA= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0 h1:hPwOshVCyWuinI9fAhJsY8HYl9EvPX8VfoQvUyxk5Dw= From ccc255f5ff31224c91d8803633cabe4649dfb0bd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:24 -0400 Subject: [PATCH 186/208] go get github.com/aws/aws-sdk-go-v2/service/ssmincidents. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4b60813d7ba..18c64f5fdce 100644 --- a/go.mod +++ b/go.mod @@ -175,7 +175,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sqs v1.33.1 github.com/aws/aws-sdk-go-v2/service/ssm v1.51.1 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.1 - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0 + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.1 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0 github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.0 diff --git a/go.sum b/go.sum index 01d6055be9c..20868b9da8b 100644 --- a/go.sum +++ b/go.sum @@ -380,8 +380,8 @@ github.com/aws/aws-sdk-go-v2/service/ssm v1.51.1 h1:MuFdaoXYgw4CPsiSa2G/T5CGOuSk github.com/aws/aws-sdk-go-v2/service/ssm v1.51.1/go.mod h1:pC8vyMIahlJIUKdXBto0R+JzoTK7+iEplKqq7DbWodY= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.1 h1:a8tzj/cicbel7pGZYjF3JOJRtyLeWYPCzqL2Plr7LM4= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.1/go.mod h1:LBJz2C528vpvnKXpS1lW139rq7ZYnRPkTgm1RcewafU= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0 h1:z9+1A3GPG1fK93uGvonnGNR5IrfGL2uv23FlhqZ5nPc= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0/go.mod h1:/ZlBCvFGploAXe+70lJ5B56ZiFsMJ9dtKjVl2nw1YSA= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.1 h1:I1k+UQhRcltDoFauDzAnYsKiXKlE6ZNYzsn7PbMpN/o= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.1/go.mod h1:Qi+hKH0d2ekPABDWOkiVWkHnpZiWqhbiVhh/MasyRPo= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0 h1:hPwOshVCyWuinI9fAhJsY8HYl9EvPX8VfoQvUyxk5Dw= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0/go.mod h1:UwEu2wMK9SX1hpj5a6Vvq/xqFHq9iDdkvOXY8yzlw/s= github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 h1:sd0BsnAvLH8gsp2e3cbaIr+9D7T1xugueQ7V/zUAsS4= From d57cb0f55bacf24dd9b9a0f25f54245057ccb710 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:24 -0400 Subject: [PATCH 187/208] go get github.com/aws/aws-sdk-go-v2/service/ssmsap. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 18c64f5fdce..583ea533cb7 100644 --- a/go.mod +++ b/go.mod @@ -176,7 +176,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssm v1.51.1 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.1 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.1 - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0 + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.1 github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.0 github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 diff --git a/go.sum b/go.sum index 20868b9da8b..e51a1b20443 100644 --- a/go.sum +++ b/go.sum @@ -382,8 +382,8 @@ github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.1 h1:a8tzj/cicbel7pGZYjF3 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.1/go.mod h1:LBJz2C528vpvnKXpS1lW139rq7ZYnRPkTgm1RcewafU= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.1 h1:I1k+UQhRcltDoFauDzAnYsKiXKlE6ZNYzsn7PbMpN/o= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.1/go.mod h1:Qi+hKH0d2ekPABDWOkiVWkHnpZiWqhbiVhh/MasyRPo= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0 h1:hPwOshVCyWuinI9fAhJsY8HYl9EvPX8VfoQvUyxk5Dw= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0/go.mod h1:UwEu2wMK9SX1hpj5a6Vvq/xqFHq9iDdkvOXY8yzlw/s= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.1 h1:Fo7XgyYfeEqzCeAxUvefMJneqoL689TSclyB6SzcAWE= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.1/go.mod h1:Pvu3mUuN20em83awAVvDXGvlTlZ40nw283BOrWG6EYI= github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 h1:sd0BsnAvLH8gsp2e3cbaIr+9D7T1xugueQ7V/zUAsS4= github.com/aws/aws-sdk-go-v2/service/sso v1.21.1/go.mod h1:lcQG/MmxydijbeTOp04hIuJwXGWPZGI3bwdFDGRTv14= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.0 h1:EqRK4n81uTTWxi337dAtJ0hc+y/bb0BZmdvsMIQnO2k= From c9b2de7f1570cb5d31a2f4a06112263f63dfa203 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:26 -0400 Subject: [PATCH 188/208] go get github.com/aws/aws-sdk-go-v2/service/ssoadmin. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 583ea533cb7..79de3821c5d 100644 --- a/go.mod +++ b/go.mod @@ -178,7 +178,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.1 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.1 github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.0 + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.1 github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 github.com/aws/aws-sdk-go-v2/service/swf v1.24.0 github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.0 diff --git a/go.sum b/go.sum index e51a1b20443..dbc5503489c 100644 --- a/go.sum +++ b/go.sum @@ -386,8 +386,8 @@ github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.1 h1:Fo7XgyYfeEqzCeAxUvefMJneq github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.1/go.mod h1:Pvu3mUuN20em83awAVvDXGvlTlZ40nw283BOrWG6EYI= github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 h1:sd0BsnAvLH8gsp2e3cbaIr+9D7T1xugueQ7V/zUAsS4= github.com/aws/aws-sdk-go-v2/service/sso v1.21.1/go.mod h1:lcQG/MmxydijbeTOp04hIuJwXGWPZGI3bwdFDGRTv14= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.0 h1:EqRK4n81uTTWxi337dAtJ0hc+y/bb0BZmdvsMIQnO2k= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.0/go.mod h1:PwPJuZ11g2G1p93H7eho8tDWF9dKeKC5LSdHoQiMKo0= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.1 h1:IB7M3gfihqPbP4oXGenFluKta7S2OWMU5otcvclmA0w= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.1/go.mod h1:N/A1nm/r9ruAvskqhfpLEymbJtLJQV1s4HR9Mn8JUnY= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1 h1:1uEFNNskK/I1KoZ9Q8wJxMz5V9jyBlsiaNrM7vA3YUQ= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1/go.mod h1:z0P8K+cBIsFXUr5rzo/psUeJ20XjPN0+Nn8067Nd+E4= github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 h1:myX5CxqXE0QMZNja6FA1/FSE3Vu1rVmeUmpJMMzeZg0= From 1da65f80a20e9dbe8c386b7c830e70d0228a8140 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:27 -0400 Subject: [PATCH 189/208] go get github.com/aws/aws-sdk-go-v2/service/swf. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 79de3821c5d..49857829f36 100644 --- a/go.mod +++ b/go.mod @@ -180,7 +180,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.1 github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 - github.com/aws/aws-sdk-go-v2/service/swf v1.24.0 + github.com/aws/aws-sdk-go-v2/service/swf v1.24.1 github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.0 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.0 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.0 diff --git a/go.sum b/go.sum index dbc5503489c..9cc9e675e70 100644 --- a/go.sum +++ b/go.sum @@ -392,8 +392,8 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1 h1:1uEFNNskK/I1KoZ9Q8wJxMz5 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1/go.mod h1:z0P8K+cBIsFXUr5rzo/psUeJ20XjPN0+Nn8067Nd+E4= github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 h1:myX5CxqXE0QMZNja6FA1/FSE3Vu1rVmeUmpJMMzeZg0= github.com/aws/aws-sdk-go-v2/service/sts v1.29.1/go.mod h1:N2mQiucsO0VwK9CYuS4/c2n6Smeh1v47Rz3dWCPFLdE= -github.com/aws/aws-sdk-go-v2/service/swf v1.24.0 h1:YgPeQKzzVAaWRtwj/ovFoEnihwwjYz8M0Wi9OC33btc= -github.com/aws/aws-sdk-go-v2/service/swf v1.24.0/go.mod h1:2d8TknRULCwm+Z3SRJAc+RKXH69TRaKZX3tra+atvRg= +github.com/aws/aws-sdk-go-v2/service/swf v1.24.1 h1:5SKFgvzgDg00ML7tvbxgahJf/2hei+Y+CBFLhcKGdTE= +github.com/aws/aws-sdk-go-v2/service/swf v1.24.1/go.mod h1:pFCXXy2Q3UFWoAzZaZ1Hha+sV7+vSV7PMc1bfhn/frM= github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.0 h1:Y/GdHJ3dQughvff9znLmc0ll/z4XKq7AFt49eS9cdL0= github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.0/go.mod h1:SUij8hDbgZ1D1gSyfM0DlaJ0MNn8lMNyrwXPGzVzoeg= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.0 h1:6MJ3GEx2SfeIgJ6Lz9drlWSCAIlFY9FB6q4UaJWjW0k= From 070c31bca841eacb7c04303039c7b15e71dfd85a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:28 -0400 Subject: [PATCH 190/208] go get github.com/aws/aws-sdk-go-v2/service/synthetics. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 49857829f36..6c31c1cd0a3 100644 --- a/go.mod +++ b/go.mod @@ -181,7 +181,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.1 github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 github.com/aws/aws-sdk-go-v2/service/swf v1.24.1 - github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.0 + github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.1 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.0 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.0 github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.0 diff --git a/go.sum b/go.sum index 9cc9e675e70..680024ec08c 100644 --- a/go.sum +++ b/go.sum @@ -394,8 +394,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 h1:myX5CxqXE0QMZNja6FA1/FSE3Vu1 github.com/aws/aws-sdk-go-v2/service/sts v1.29.1/go.mod h1:N2mQiucsO0VwK9CYuS4/c2n6Smeh1v47Rz3dWCPFLdE= github.com/aws/aws-sdk-go-v2/service/swf v1.24.1 h1:5SKFgvzgDg00ML7tvbxgahJf/2hei+Y+CBFLhcKGdTE= github.com/aws/aws-sdk-go-v2/service/swf v1.24.1/go.mod h1:pFCXXy2Q3UFWoAzZaZ1Hha+sV7+vSV7PMc1bfhn/frM= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.0 h1:Y/GdHJ3dQughvff9znLmc0ll/z4XKq7AFt49eS9cdL0= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.0/go.mod h1:SUij8hDbgZ1D1gSyfM0DlaJ0MNn8lMNyrwXPGzVzoeg= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.1 h1:It6Hgms3aJvkldek7bAgatZX59x2ORMF1WRnoCvOBE4= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.1/go.mod h1:YX/Ra26SfE8jG/qhzVUH67snS1e/ipvk+g0deQiKznU= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.0 h1:6MJ3GEx2SfeIgJ6Lz9drlWSCAIlFY9FB6q4UaJWjW0k= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.0/go.mod h1:MQ2A6JqwaOyHWZ9/X6aLasQzwENEh3lrN3S4QQABGQw= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.0 h1:O/DNMp52fWip+R6+r7Gv2mM5nhxP7yguQAaubSn/PvQ= From 21d2ad0be5dd87ae99014f315cdcc6fcc2e72410 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:29 -0400 Subject: [PATCH 191/208] go get github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6c31c1cd0a3..491cd23fb51 100644 --- a/go.mod +++ b/go.mod @@ -182,7 +182,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 github.com/aws/aws-sdk-go-v2/service/swf v1.24.1 github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.1 - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.0 + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.1 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.0 github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.0 github.com/aws/aws-sdk-go-v2/service/transfer v1.49.0 diff --git a/go.sum b/go.sum index 680024ec08c..0e603c81c34 100644 --- a/go.sum +++ b/go.sum @@ -396,8 +396,8 @@ github.com/aws/aws-sdk-go-v2/service/swf v1.24.1 h1:5SKFgvzgDg00ML7tvbxgahJf/2he github.com/aws/aws-sdk-go-v2/service/swf v1.24.1/go.mod h1:pFCXXy2Q3UFWoAzZaZ1Hha+sV7+vSV7PMc1bfhn/frM= github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.1 h1:It6Hgms3aJvkldek7bAgatZX59x2ORMF1WRnoCvOBE4= github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.1/go.mod h1:YX/Ra26SfE8jG/qhzVUH67snS1e/ipvk+g0deQiKznU= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.0 h1:6MJ3GEx2SfeIgJ6Lz9drlWSCAIlFY9FB6q4UaJWjW0k= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.0/go.mod h1:MQ2A6JqwaOyHWZ9/X6aLasQzwENEh3lrN3S4QQABGQw= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.1 h1:DKIdl+mjQdvpT+UxQqdJzagpVi/byLd86+LqVa5lrfs= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.1/go.mod h1:QBXvMbzNfHCVQ1pPiJ3VfIvYQ2Lakda/CDjs2eyFVus= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.0 h1:O/DNMp52fWip+R6+r7Gv2mM5nhxP7yguQAaubSn/PvQ= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.0/go.mod h1:kNfpzthakWe9UqaJqCXAfAfTtNahf0u8nHvn4I7UQFo= github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.0 h1:nvNlvVnfja9AxLpPis0inO6TfrrKE8wJn9ie1b43PCE= From bc227f863a5475b0bc8bb7d14b1a4a50f1645ccd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:30 -0400 Subject: [PATCH 192/208] go get github.com/aws/aws-sdk-go-v2/service/timestreamwrite. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 491cd23fb51..2ca74700fb9 100644 --- a/go.mod +++ b/go.mod @@ -183,7 +183,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/swf v1.24.1 github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.1 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.1 - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.0 + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.1 github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.0 github.com/aws/aws-sdk-go-v2/service/transfer v1.49.0 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.0 diff --git a/go.sum b/go.sum index 0e603c81c34..522e0bf7e4b 100644 --- a/go.sum +++ b/go.sum @@ -398,8 +398,8 @@ github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.1 h1:It6Hgms3aJvkldek7bAga github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.1/go.mod h1:YX/Ra26SfE8jG/qhzVUH67snS1e/ipvk+g0deQiKznU= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.1 h1:DKIdl+mjQdvpT+UxQqdJzagpVi/byLd86+LqVa5lrfs= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.1/go.mod h1:QBXvMbzNfHCVQ1pPiJ3VfIvYQ2Lakda/CDjs2eyFVus= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.0 h1:O/DNMp52fWip+R6+r7Gv2mM5nhxP7yguQAaubSn/PvQ= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.0/go.mod h1:kNfpzthakWe9UqaJqCXAfAfTtNahf0u8nHvn4I7UQFo= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.1 h1:zmrL3QlVMeFFoSY7eeTxvyVkvXwbzH+4CkNk+IcCQ6c= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.1/go.mod h1:3c9FWFZFRg26pEXRBa9hJ7z7kFmfJZLOM3IvfO0QcDs= github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.0 h1:nvNlvVnfja9AxLpPis0inO6TfrrKE8wJn9ie1b43PCE= github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.0/go.mod h1:/maZhUhTzl0CpiFVRphpvolzHafQbUxb6KiZ4zFmLLA= github.com/aws/aws-sdk-go-v2/service/transfer v1.49.0 h1:UXdzHgO6jsEpsFOyOpAV6DoBExpiESRqbbNwHG4DKIw= From 08f8677445379681505bc1613bf7f70f46a3e4e4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:30 -0400 Subject: [PATCH 193/208] go get github.com/aws/aws-sdk-go-v2/service/transcribe. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2ca74700fb9..19e800d19d2 100644 --- a/go.mod +++ b/go.mod @@ -184,7 +184,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.1 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.1 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.1 - github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.0 + github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.1 github.com/aws/aws-sdk-go-v2/service/transfer v1.49.0 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.0 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.0 diff --git a/go.sum b/go.sum index 522e0bf7e4b..693cebb3c7a 100644 --- a/go.sum +++ b/go.sum @@ -400,8 +400,8 @@ github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.1 h1:DKIdl+mjQdvpT+ github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.1/go.mod h1:QBXvMbzNfHCVQ1pPiJ3VfIvYQ2Lakda/CDjs2eyFVus= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.1 h1:zmrL3QlVMeFFoSY7eeTxvyVkvXwbzH+4CkNk+IcCQ6c= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.1/go.mod h1:3c9FWFZFRg26pEXRBa9hJ7z7kFmfJZLOM3IvfO0QcDs= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.0 h1:nvNlvVnfja9AxLpPis0inO6TfrrKE8wJn9ie1b43PCE= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.0/go.mod h1:/maZhUhTzl0CpiFVRphpvolzHafQbUxb6KiZ4zFmLLA= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.1 h1:KzLj8Ndp0FW7CWo/r53IMhZ9EBo7xKvqYONf8B81hzQ= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.1/go.mod h1:lTU0fIPy0DJqbtogTN+QlxFPJZGHrBW+GJuhVbLAsd0= github.com/aws/aws-sdk-go-v2/service/transfer v1.49.0 h1:UXdzHgO6jsEpsFOyOpAV6DoBExpiESRqbbNwHG4DKIw= github.com/aws/aws-sdk-go-v2/service/transfer v1.49.0/go.mod h1:mNpqi2+uajhgdbbTQA8/REXyccSTy8+oDAH9LCy4fWs= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.0 h1:vcy97DbO72iIUHLhoeGUSwQBgwESRz0/RE6ori2qRPE= From b311780eb43bc2331ced412c3ae9916c9f4b0e9f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:31 -0400 Subject: [PATCH 194/208] go get github.com/aws/aws-sdk-go-v2/service/transfer. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 19e800d19d2..23ea90417a6 100644 --- a/go.mod +++ b/go.mod @@ -185,7 +185,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.1 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.1 github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.1 - github.com/aws/aws-sdk-go-v2/service/transfer v1.49.0 + github.com/aws/aws-sdk-go-v2/service/transfer v1.49.1 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.0 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.0 github.com/aws/aws-sdk-go-v2/service/waf v1.22.0 diff --git a/go.sum b/go.sum index 693cebb3c7a..40b3bc7b86b 100644 --- a/go.sum +++ b/go.sum @@ -402,8 +402,8 @@ github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.1 h1:zmrL3QlVMeFFoSY7 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.1/go.mod h1:3c9FWFZFRg26pEXRBa9hJ7z7kFmfJZLOM3IvfO0QcDs= github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.1 h1:KzLj8Ndp0FW7CWo/r53IMhZ9EBo7xKvqYONf8B81hzQ= github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.1/go.mod h1:lTU0fIPy0DJqbtogTN+QlxFPJZGHrBW+GJuhVbLAsd0= -github.com/aws/aws-sdk-go-v2/service/transfer v1.49.0 h1:UXdzHgO6jsEpsFOyOpAV6DoBExpiESRqbbNwHG4DKIw= -github.com/aws/aws-sdk-go-v2/service/transfer v1.49.0/go.mod h1:mNpqi2+uajhgdbbTQA8/REXyccSTy8+oDAH9LCy4fWs= +github.com/aws/aws-sdk-go-v2/service/transfer v1.49.1 h1:qtw+AYR7f9UggfBqz7gUntNOk+UWh3zdYdcSWDwKXL8= +github.com/aws/aws-sdk-go-v2/service/transfer v1.49.1/go.mod h1:GlVT65BhLN/ia7JsqqUHcLGamdRDLRJgG+OidHKnqbI= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.0 h1:vcy97DbO72iIUHLhoeGUSwQBgwESRz0/RE6ori2qRPE= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.0/go.mod h1:KKWkumFpy/2QsK0oMNLVNhTK8Hj30DNeQ2kedEsW6u8= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.0 h1:AjgOeauxg/8dA7+xM2CuxrJmAzDQgiwTGgfrXtJznuo= From cf5782a1bc3561774a8854d901a476f29e4d216a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:32 -0400 Subject: [PATCH 195/208] go get github.com/aws/aws-sdk-go-v2/service/verifiedpermissions. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 23ea90417a6..4c5a3a21b12 100644 --- a/go.mod +++ b/go.mod @@ -186,7 +186,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.1 github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.1 github.com/aws/aws-sdk-go-v2/service/transfer v1.49.1 - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.0 + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.1 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.0 github.com/aws/aws-sdk-go-v2/service/waf v1.22.0 github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.0 diff --git a/go.sum b/go.sum index 40b3bc7b86b..c5db02df27d 100644 --- a/go.sum +++ b/go.sum @@ -404,8 +404,8 @@ github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.1 h1:KzLj8Ndp0FW7CWo/r53IM github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.1/go.mod h1:lTU0fIPy0DJqbtogTN+QlxFPJZGHrBW+GJuhVbLAsd0= github.com/aws/aws-sdk-go-v2/service/transfer v1.49.1 h1:qtw+AYR7f9UggfBqz7gUntNOk+UWh3zdYdcSWDwKXL8= github.com/aws/aws-sdk-go-v2/service/transfer v1.49.1/go.mod h1:GlVT65BhLN/ia7JsqqUHcLGamdRDLRJgG+OidHKnqbI= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.0 h1:vcy97DbO72iIUHLhoeGUSwQBgwESRz0/RE6ori2qRPE= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.0/go.mod h1:KKWkumFpy/2QsK0oMNLVNhTK8Hj30DNeQ2kedEsW6u8= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.1 h1:d+8Gw9BYBXV3NirQNHLOSS3jC5SAI2s83rmaPKExqiA= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.1/go.mod h1:18uGZxP22gTNTF7s3Hytn5a38uGwKbKV/twAlF5RGrU= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.0 h1:AjgOeauxg/8dA7+xM2CuxrJmAzDQgiwTGgfrXtJznuo= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.0/go.mod h1:GVgqis1OIPeYVZo9/tC5P6TbO+eqPj6j5AMBLJocKgA= github.com/aws/aws-sdk-go-v2/service/waf v1.22.0 h1:VF0/BiT3DB/Evkf0HUdPrjuGz5mYAj5MRNM+XP57Yy4= From 3b34c0d10bc11139bf88f057a354faea4251cfd3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:33 -0400 Subject: [PATCH 196/208] go get github.com/aws/aws-sdk-go-v2/service/vpclattice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4c5a3a21b12..b0553c69a3e 100644 --- a/go.mod +++ b/go.mod @@ -187,7 +187,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.1 github.com/aws/aws-sdk-go-v2/service/transfer v1.49.1 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.1 - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.0 + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.1 github.com/aws/aws-sdk-go-v2/service/waf v1.22.0 github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.0 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.0 diff --git a/go.sum b/go.sum index c5db02df27d..a2a62a805ee 100644 --- a/go.sum +++ b/go.sum @@ -406,8 +406,8 @@ github.com/aws/aws-sdk-go-v2/service/transfer v1.49.1 h1:qtw+AYR7f9UggfBqz7gUntN github.com/aws/aws-sdk-go-v2/service/transfer v1.49.1/go.mod h1:GlVT65BhLN/ia7JsqqUHcLGamdRDLRJgG+OidHKnqbI= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.1 h1:d+8Gw9BYBXV3NirQNHLOSS3jC5SAI2s83rmaPKExqiA= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.1/go.mod h1:18uGZxP22gTNTF7s3Hytn5a38uGwKbKV/twAlF5RGrU= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.0 h1:AjgOeauxg/8dA7+xM2CuxrJmAzDQgiwTGgfrXtJznuo= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.0/go.mod h1:GVgqis1OIPeYVZo9/tC5P6TbO+eqPj6j5AMBLJocKgA= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.1 h1:wgOGWcWNKmEpKBwDWGZAz9svWXelZb3AXhPho+k3gHs= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.1/go.mod h1:rx5U6Ai/YvQkHmufCxvqqA1edhy4/B7TDtgj6IcRlPM= github.com/aws/aws-sdk-go-v2/service/waf v1.22.0 h1:VF0/BiT3DB/Evkf0HUdPrjuGz5mYAj5MRNM+XP57Yy4= github.com/aws/aws-sdk-go-v2/service/waf v1.22.0/go.mod h1:zEuwy5BLf2Ax04YWoX+aOFQldspfNSw6cOzh2c1FE9o= github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.0 h1:BoaV3DB54jcoeaXpa0cS/0AYbGND0+pUinh78WNEAsk= From 50dc4e8cc12fc21ff55639fae6ba29c25d6fa256 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:34 -0400 Subject: [PATCH 197/208] go get github.com/aws/aws-sdk-go-v2/service/waf. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b0553c69a3e..7f5d7d44be4 100644 --- a/go.mod +++ b/go.mod @@ -188,7 +188,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/transfer v1.49.1 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.1 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.1 - github.com/aws/aws-sdk-go-v2/service/waf v1.22.0 + github.com/aws/aws-sdk-go-v2/service/waf v1.22.1 github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.0 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.0 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.0 diff --git a/go.sum b/go.sum index a2a62a805ee..3284f21ec75 100644 --- a/go.sum +++ b/go.sum @@ -408,8 +408,8 @@ github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.1 h1:d+8Gw9BYBXV3 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.1/go.mod h1:18uGZxP22gTNTF7s3Hytn5a38uGwKbKV/twAlF5RGrU= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.1 h1:wgOGWcWNKmEpKBwDWGZAz9svWXelZb3AXhPho+k3gHs= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.1/go.mod h1:rx5U6Ai/YvQkHmufCxvqqA1edhy4/B7TDtgj6IcRlPM= -github.com/aws/aws-sdk-go-v2/service/waf v1.22.0 h1:VF0/BiT3DB/Evkf0HUdPrjuGz5mYAj5MRNM+XP57Yy4= -github.com/aws/aws-sdk-go-v2/service/waf v1.22.0/go.mod h1:zEuwy5BLf2Ax04YWoX+aOFQldspfNSw6cOzh2c1FE9o= +github.com/aws/aws-sdk-go-v2/service/waf v1.22.1 h1:tThCZniinFeLPAoazNu7mim/ipCKZKIjT2UZrxUQcQU= +github.com/aws/aws-sdk-go-v2/service/waf v1.22.1/go.mod h1:4o8nB9c6IGaAzCdx9maPjeKpwAVzEy3f/6yQtbEoBTs= github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.0 h1:BoaV3DB54jcoeaXpa0cS/0AYbGND0+pUinh78WNEAsk= github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.0/go.mod h1:tcc5r0O8/SAAZ90CgLsFJuu+YN06mKOQTBv7BvgSywA= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.0 h1:+R3R+PHVgzeN6iQ7y8aBX/4MPYDmDmd0DfFV1xfYdNk= From 8027ab34e9df41ee13936d9b90116014afe9e8b3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:35 -0400 Subject: [PATCH 198/208] go get github.com/aws/aws-sdk-go-v2/service/wafregional. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7f5d7d44be4..9b785c80dac 100644 --- a/go.mod +++ b/go.mod @@ -189,7 +189,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.1 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.1 github.com/aws/aws-sdk-go-v2/service/waf v1.22.1 - github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.0 + github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.1 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.0 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.0 github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.0 diff --git a/go.sum b/go.sum index 3284f21ec75..0f8efd48bce 100644 --- a/go.sum +++ b/go.sum @@ -410,8 +410,8 @@ github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.1 h1:wgOGWcWNKmEpKBwDWGZAz9 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.1/go.mod h1:rx5U6Ai/YvQkHmufCxvqqA1edhy4/B7TDtgj6IcRlPM= github.com/aws/aws-sdk-go-v2/service/waf v1.22.1 h1:tThCZniinFeLPAoazNu7mim/ipCKZKIjT2UZrxUQcQU= github.com/aws/aws-sdk-go-v2/service/waf v1.22.1/go.mod h1:4o8nB9c6IGaAzCdx9maPjeKpwAVzEy3f/6yQtbEoBTs= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.0 h1:BoaV3DB54jcoeaXpa0cS/0AYbGND0+pUinh78WNEAsk= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.0/go.mod h1:tcc5r0O8/SAAZ90CgLsFJuu+YN06mKOQTBv7BvgSywA= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.1 h1:au7mSQqu+gxxQuG1P0YCgM0w0OP4Sk7rReHVWtua+dY= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.1/go.mod h1:wI+EyfF4sTj905uEIaSiflGusqxkizZ8BEsfjgglmCE= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.0 h1:+R3R+PHVgzeN6iQ7y8aBX/4MPYDmDmd0DfFV1xfYdNk= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.0/go.mod h1:W5X+xXQU61asHCukaIpOuGjfOy8v24iRNES44MpIRBI= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.0 h1:acyDLMysdSfKfQJxBENybpz10ztsLITWza447ip6wII= From 35a79f327b9f99ee292a6564eb7030f3c946f64b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:35 -0400 Subject: [PATCH 199/208] go get github.com/aws/aws-sdk-go-v2/service/wafv2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9b785c80dac..1d96cf3fca0 100644 --- a/go.mod +++ b/go.mod @@ -190,7 +190,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.1 github.com/aws/aws-sdk-go-v2/service/waf v1.22.1 github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.1 - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.0 + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.1 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.0 github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.0 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.0 diff --git a/go.sum b/go.sum index 0f8efd48bce..83ad47b3c53 100644 --- a/go.sum +++ b/go.sum @@ -412,8 +412,8 @@ github.com/aws/aws-sdk-go-v2/service/waf v1.22.1 h1:tThCZniinFeLPAoazNu7mim/ipCK github.com/aws/aws-sdk-go-v2/service/waf v1.22.1/go.mod h1:4o8nB9c6IGaAzCdx9maPjeKpwAVzEy3f/6yQtbEoBTs= github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.1 h1:au7mSQqu+gxxQuG1P0YCgM0w0OP4Sk7rReHVWtua+dY= github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.1/go.mod h1:wI+EyfF4sTj905uEIaSiflGusqxkizZ8BEsfjgglmCE= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.0 h1:+R3R+PHVgzeN6iQ7y8aBX/4MPYDmDmd0DfFV1xfYdNk= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.0/go.mod h1:W5X+xXQU61asHCukaIpOuGjfOy8v24iRNES44MpIRBI= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.1 h1:cp9UYbI4IOMNczk/1PeGkUWfZH5xbdPGBgVVJs4MvgE= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.1/go.mod h1:LKpRTYGj4TQXkDRIdcH6U/BdiVSh+IPmXExACuDK+nQ= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.0 h1:acyDLMysdSfKfQJxBENybpz10ztsLITWza447ip6wII= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.0/go.mod h1:DIUvkoJg5kC9K4j342eAK6anceSNNUO7iwa2vhYsBsc= github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.0 h1:rk4tLvt53j6msxrSS2tn2pFXPo4Q2mj7Kt5HAnPKFQU= From 5eb08b52cb95ebe5c6b37e545e0c03c2b5f2d392 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:36 -0400 Subject: [PATCH 200/208] go get github.com/aws/aws-sdk-go-v2/service/wellarchitected. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1d96cf3fca0..b97f1402610 100644 --- a/go.mod +++ b/go.mod @@ -191,7 +191,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/waf v1.22.1 github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.1 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.1 - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.0 + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.1 github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.0 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.0 github.com/aws/aws-sdk-go-v2/service/xray v1.26.0 diff --git a/go.sum b/go.sum index 83ad47b3c53..25afdf8caf4 100644 --- a/go.sum +++ b/go.sum @@ -414,8 +414,8 @@ github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.1 h1:au7mSQqu+gxxQuG1P0YC github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.1/go.mod h1:wI+EyfF4sTj905uEIaSiflGusqxkizZ8BEsfjgglmCE= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.1 h1:cp9UYbI4IOMNczk/1PeGkUWfZH5xbdPGBgVVJs4MvgE= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.1/go.mod h1:LKpRTYGj4TQXkDRIdcH6U/BdiVSh+IPmXExACuDK+nQ= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.0 h1:acyDLMysdSfKfQJxBENybpz10ztsLITWza447ip6wII= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.0/go.mod h1:DIUvkoJg5kC9K4j342eAK6anceSNNUO7iwa2vhYsBsc= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.1 h1:CzuwkrjJx71qGieDJofWaXlGXo7rBqbaC+sbaiuGo/M= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.1/go.mod h1:/nDTaO0dBchAbqwQrPFl81YyuxR8KLcJP67XzIIOrbg= github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.0 h1:rk4tLvt53j6msxrSS2tn2pFXPo4Q2mj7Kt5HAnPKFQU= github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.0/go.mod h1:ARJ/HUyRaIhxIiym/cCJJ6OqBowtZNh7jmVeTPPqrjo= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.0 h1:KRE7Xj1nVszmqd6fCLO5FDSl913kA3O8Z9eHJ4F4YBk= From ddabdc091380885e5d1521107879fc6bc299cc5b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:37 -0400 Subject: [PATCH 201/208] go get github.com/aws/aws-sdk-go-v2/service/workspaces. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b97f1402610..1f1f6f2fbd0 100644 --- a/go.mod +++ b/go.mod @@ -192,7 +192,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.1 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.1 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.1 - github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.0 + github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.1 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.0 github.com/aws/aws-sdk-go-v2/service/xray v1.26.0 github.com/aws/smithy-go v1.20.2 diff --git a/go.sum b/go.sum index 25afdf8caf4..65cc83828a2 100644 --- a/go.sum +++ b/go.sum @@ -416,8 +416,8 @@ github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.1 h1:cp9UYbI4IOMNczk/1PeGkUWfZH github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.1/go.mod h1:LKpRTYGj4TQXkDRIdcH6U/BdiVSh+IPmXExACuDK+nQ= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.1 h1:CzuwkrjJx71qGieDJofWaXlGXo7rBqbaC+sbaiuGo/M= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.1/go.mod h1:/nDTaO0dBchAbqwQrPFl81YyuxR8KLcJP67XzIIOrbg= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.0 h1:rk4tLvt53j6msxrSS2tn2pFXPo4Q2mj7Kt5HAnPKFQU= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.0/go.mod h1:ARJ/HUyRaIhxIiym/cCJJ6OqBowtZNh7jmVeTPPqrjo= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.1 h1:B3Y0d+jwez16NFDUGmEhXhx96EuwH07ERfHyMCjwDEQ= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.1/go.mod h1:u1LDClOljTCdY66v1x8jRqAzqr7f2tYSPbaOv+40PKM= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.0 h1:KRE7Xj1nVszmqd6fCLO5FDSl913kA3O8Z9eHJ4F4YBk= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.0/go.mod h1:5d3kNhMcAt3bG+iJ/XOOMJrXLN9Cls07mGxoqln4dFg= github.com/aws/aws-sdk-go-v2/service/xray v1.26.0 h1:pP/IrtNrY9zP1aBaXoy+ebt7qJ9fDIS/TP+3IT54+/o= From c2ae41f4b9d2a24a813f5d2ca51d5a807e990a8a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:38 -0400 Subject: [PATCH 202/208] go get github.com/aws/aws-sdk-go-v2/service/workspacesweb. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1f1f6f2fbd0..5327d6c5bbc 100644 --- a/go.mod +++ b/go.mod @@ -193,7 +193,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.1 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.1 github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.1 - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.0 + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.1 github.com/aws/aws-sdk-go-v2/service/xray v1.26.0 github.com/aws/smithy-go v1.20.2 github.com/beevik/etree v1.4.0 diff --git a/go.sum b/go.sum index 65cc83828a2..e309d4a0dfc 100644 --- a/go.sum +++ b/go.sum @@ -418,8 +418,8 @@ github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.1 h1:CzuwkrjJx71qGieD github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.1/go.mod h1:/nDTaO0dBchAbqwQrPFl81YyuxR8KLcJP67XzIIOrbg= github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.1 h1:B3Y0d+jwez16NFDUGmEhXhx96EuwH07ERfHyMCjwDEQ= github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.1/go.mod h1:u1LDClOljTCdY66v1x8jRqAzqr7f2tYSPbaOv+40PKM= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.0 h1:KRE7Xj1nVszmqd6fCLO5FDSl913kA3O8Z9eHJ4F4YBk= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.0/go.mod h1:5d3kNhMcAt3bG+iJ/XOOMJrXLN9Cls07mGxoqln4dFg= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.1 h1:1XvY5lu415RgtZjBRI/X3RtIg4rlmJCGVBa1g6UWNTs= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.1/go.mod h1:9OLCaeqeG3cHCH1RoADMg3n0dQjxzbxwfxmKM+ALcl4= github.com/aws/aws-sdk-go-v2/service/xray v1.26.0 h1:pP/IrtNrY9zP1aBaXoy+ebt7qJ9fDIS/TP+3IT54+/o= github.com/aws/aws-sdk-go-v2/service/xray v1.26.0/go.mod h1:2Hhdl4R0u2M3H3KnTXK8VPQSt0QSyFwW1eu7WW6bOqw= github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= From ed575cfec52d8f2d936b057041f211615be75023 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:39 -0400 Subject: [PATCH 203/208] go get github.com/aws/aws-sdk-go-v2/service/xray. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5327d6c5bbc..b7c04482f9c 100644 --- a/go.mod +++ b/go.mod @@ -194,7 +194,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.1 github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.1 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.1 - github.com/aws/aws-sdk-go-v2/service/xray v1.26.0 + github.com/aws/aws-sdk-go-v2/service/xray v1.26.1 github.com/aws/smithy-go v1.20.2 github.com/beevik/etree v1.4.0 github.com/cedar-policy/cedar-go v0.0.0-20240318205125-470d1fe984bb diff --git a/go.sum b/go.sum index e309d4a0dfc..39648e00d06 100644 --- a/go.sum +++ b/go.sum @@ -420,8 +420,8 @@ github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.1 h1:B3Y0d+jwez16NFDUGmEhX github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.1/go.mod h1:u1LDClOljTCdY66v1x8jRqAzqr7f2tYSPbaOv+40PKM= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.1 h1:1XvY5lu415RgtZjBRI/X3RtIg4rlmJCGVBa1g6UWNTs= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.1/go.mod h1:9OLCaeqeG3cHCH1RoADMg3n0dQjxzbxwfxmKM+ALcl4= -github.com/aws/aws-sdk-go-v2/service/xray v1.26.0 h1:pP/IrtNrY9zP1aBaXoy+ebt7qJ9fDIS/TP+3IT54+/o= -github.com/aws/aws-sdk-go-v2/service/xray v1.26.0/go.mod h1:2Hhdl4R0u2M3H3KnTXK8VPQSt0QSyFwW1eu7WW6bOqw= +github.com/aws/aws-sdk-go-v2/service/xray v1.26.1 h1:HYDnKTBHT0bDROhdSvrBOWO/hR3dk4zvQBxs1Hy8HsY= +github.com/aws/aws-sdk-go-v2/service/xray v1.26.1/go.mod h1:hzagwUFkLbUYjoG391sGdiWWfZacwrwp5GZQQLz1sxg= github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/beevik/etree v1.4.0 h1:oz1UedHRepuY3p4N5OjE0nK1WLCqtzHf25bxplKOHLs= From eb2175dc3525a81cf8b7ad29f00e3efbf1076537 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:41:45 -0400 Subject: [PATCH 204/208] go get github.com/aws/aws-sdk-go. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b7c04482f9c..1740d9de65b 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/ProtonMail/go-crypto v1.1.0-alpha.2 github.com/YakDriver/go-version v0.1.0 github.com/YakDriver/regexache v0.23.0 - github.com/aws/aws-sdk-go v1.54.4 + github.com/aws/aws-sdk-go v1.54.5 github.com/aws/aws-sdk-go-v2 v1.30.0 github.com/aws/aws-sdk-go-v2/config v1.27.21 github.com/aws/aws-sdk-go-v2/credentials v1.17.21 diff --git a/go.sum b/go.sum index 39648e00d06..d82438079ca 100644 --- a/go.sum +++ b/go.sum @@ -22,8 +22,8 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.54.4 h1:xZga3fPu7uxVgh83DIaQlb7r0cixFx1xKiiROTWAhpU= -github.com/aws/aws-sdk-go v1.54.4/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go v1.54.5 h1:uOYrME3NWf7/J7orDdhZbF8IQCNkE7OZHATdzWS0ok0= +github.com/aws/aws-sdk-go v1.54.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v1.30.0 h1:6qAwtzlfcTtcL8NHtbDQAqgM5s6NDipQTkPxyH/6kAA= github.com/aws/aws-sdk-go-v2 v1.30.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to= From 6ed85994aed535ea351ebd99c97c768bdb6e9358 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 10:43:09 -0400 Subject: [PATCH 205/208] Run 'make clean-tidy'. --- tools/tfsdk2fw/go.mod | 393 ++++++++++----------- tools/tfsdk2fw/go.sum | 786 +++++++++++++++++++++--------------------- 2 files changed, 591 insertions(+), 588 deletions(-) diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 19e8c41dd5e..68365ae10dd 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -18,205 +18,206 @@ require ( github.com/agext/levenshtein v1.2.3 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/armon/go-radix v1.0.0 // indirect - github.com/aws/aws-sdk-go v1.54.4 // indirect - github.com/aws/aws-sdk-go-v2 v1.29.0 // indirect + github.com/aws/aws-sdk-go v1.54.5 // indirect + github.com/aws/aws-sdk-go-v2 v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect - github.com/aws/aws-sdk-go-v2/config v1.27.20 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.17.20 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.7 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.0 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.11 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.11 // indirect + github.com/aws/aws-sdk-go-v2/config v1.27.21 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.21 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.1 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.11 // indirect - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/account v1.18.0 // indirect - github.com/aws/aws-sdk-go-v2/service/acm v1.27.0 // indirect - github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/amp v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/amplify v1.22.0 // indirect - github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appflow v1.42.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.0 // indirect - github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appstream v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/athena v1.42.0 // indirect - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.0 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/backup v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/batch v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.0 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.0 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.0 // indirect - github.com/aws/aws-sdk-go-v2/service/budgets v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.0 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.0 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/configservice v1.47.0 // indirect - github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.0 // indirect - github.com/aws/aws-sdk-go-v2/service/controltower v1.15.0 // indirect - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.0 // indirect - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/datasync v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/datazone v1.10.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dax v1.20.0 // indirect - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dlm v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/docdb v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.0 // indirect - github.com/aws/aws-sdk-go-v2/service/drs v1.27.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecr v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.43.0 // indirect - github.com/aws/aws-sdk-go-v2/service/eks v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/emr v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.0 // indirect - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/evidently v1.20.0 // indirect - github.com/aws/aws-sdk-go-v2/service/finspace v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/firehose v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/fis v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/fms v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/glacier v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/iam v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12 // indirect + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/account v1.18.1 // indirect + github.com/aws/aws-sdk-go-v2/service/acm v1.27.1 // indirect + github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/amp v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/amplify v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appflow v1.42.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.1 // indirect + github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appstream v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appsync v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/athena v1.43.0 // indirect + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.1 // indirect + github.com/aws/aws-sdk-go-v2/service/backup v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/batch v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.1 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.1 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.1 // indirect + github.com/aws/aws-sdk-go-v2/service/budgets v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.1 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.1 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1 // indirect + github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.1 // indirect + github.com/aws/aws-sdk-go-v2/service/controltower v1.15.1 // indirect + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.25.0 // indirect + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.1 // indirect + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/datasync v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/datazone v1.10.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dax v1.20.1 // indirect + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dlm v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/docdb v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.1 // indirect + github.com/aws/aws-sdk-go-v2/service/drs v1.27.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.43.1 // indirect + github.com/aws/aws-sdk-go-v2/service/eks v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/emr v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/evidently v1.20.1 // indirect + github.com/aws/aws-sdk-go-v2/service/finspace v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/firehose v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/fis v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/fms v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/glacier v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/iam v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.13 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.12 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.13 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.11 // indirect - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kafka v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kendra v1.51.0 // indirect - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kms v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lambda v1.55.0 // indirect - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/m2 v1.14.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.0 // indirect - github.com/aws/aws-sdk-go-v2/service/medialive v1.53.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mq v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.0 // indirect - github.com/aws/aws-sdk-go-v2/service/oam v1.12.0 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.0 // indirect - github.com/aws/aws-sdk-go-v2/service/organizations v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/osis v1.11.0 // indirect - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pipes v1.13.0 // indirect - github.com/aws/aws-sdk-go-v2/service/polly v1.41.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pricing v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.0 // indirect - github.com/aws/aws-sdk-go-v2/service/qldb v1.22.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ram v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rbin v1.17.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rds v1.80.0 // indirect - github.com/aws/aws-sdk-go-v2/service/redshift v1.45.0 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53 v1.41.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rum v1.18.0 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.56.0 // indirect - github.com/aws/aws-sdk-go-v2/service/s3control v1.45.0 // indirect - github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.0 // indirect - github.com/aws/aws-sdk-go-v2/service/schemas v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.0 // indirect - github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.0 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.0 // indirect - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/shield v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/signer v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sns v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sqs v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.51.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/swf v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.0 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/transfer v1.49.0 // indirect - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.0 // indirect - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.0 // indirect - github.com/aws/aws-sdk-go-v2/service/waf v1.22.0 // indirect - github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.0 // indirect - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.0 // indirect - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.0 // indirect - github.com/aws/aws-sdk-go-v2/service/xray v1.26.0 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.14 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.13 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12 // indirect + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kafka v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kendra v1.51.1 // indirect + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kms v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lambda v1.55.1 // indirect + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/m2 v1.14.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.1 // indirect + github.com/aws/aws-sdk-go-v2/service/medialive v1.53.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mq v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.1 // indirect + github.com/aws/aws-sdk-go-v2/service/oam v1.12.1 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.1 // indirect + github.com/aws/aws-sdk-go-v2/service/organizations v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/osis v1.11.1 // indirect + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pipes v1.13.1 // indirect + github.com/aws/aws-sdk-go-v2/service/polly v1.41.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pricing v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.1 // indirect + github.com/aws/aws-sdk-go-v2/service/qldb v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ram v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rbin v1.17.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rds v1.80.1 // indirect + github.com/aws/aws-sdk-go-v2/service/redshift v1.45.1 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.1 // indirect + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.1 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53 v1.41.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rum v1.18.1 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 // indirect + github.com/aws/aws-sdk-go-v2/service/s3control v1.45.1 // indirect + github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.1 // indirect + github.com/aws/aws-sdk-go-v2/service/schemas v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.1 // indirect + github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/shield v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/signer v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sns v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sqs v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.51.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/swf v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.1 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/transfer v1.49.1 // indirect + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.1 // indirect + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.1 // indirect + github.com/aws/aws-sdk-go-v2/service/waf v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.1 // indirect + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.1 // indirect + github.com/aws/aws-sdk-go-v2/service/xray v1.26.1 // indirect github.com/aws/smithy-go v1.20.2 // indirect github.com/beevik/etree v1.4.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index f988c65a712..8c79c3fc4b5 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -22,404 +22,406 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.54.4 h1:xZga3fPu7uxVgh83DIaQlb7r0cixFx1xKiiROTWAhpU= -github.com/aws/aws-sdk-go v1.54.4/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= -github.com/aws/aws-sdk-go-v2 v1.29.0 h1:uMlEecEwgp2gs6CsM6ugquNHr6mg0LHylPBR8u5Ojac= -github.com/aws/aws-sdk-go-v2 v1.29.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= +github.com/aws/aws-sdk-go v1.54.5 h1:uOYrME3NWf7/J7orDdhZbF8IQCNkE7OZHATdzWS0ok0= +github.com/aws/aws-sdk-go v1.54.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go-v2 v1.30.0 h1:6qAwtzlfcTtcL8NHtbDQAqgM5s6NDipQTkPxyH/6kAA= +github.com/aws/aws-sdk-go-v2 v1.30.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2/go.mod h1:lPprDr1e6cJdyYeGXnRaJoP4Md+cDBvi2eOj00BlGmg= -github.com/aws/aws-sdk-go-v2/config v1.27.20 h1:oQSn/KNUMV54X0FBEDQQ2ymNfcKyMT81ar8gyvMzzqs= -github.com/aws/aws-sdk-go-v2/config v1.27.20/go.mod h1:IbEMotJrWc3Bh7++HXZDlviHZP7kHrkHU3PNl9e17po= -github.com/aws/aws-sdk-go-v2/credentials v1.17.20 h1:VYTCplAeOeBv5InTtrmF61OIwD4aHKryg3KZ6hf7dsI= -github.com/aws/aws-sdk-go-v2/credentials v1.17.20/go.mod h1:ktubcFYvbN8++72jVM9IJoQH6Q2TP+Z7r2VbV1AaESU= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.7 h1:54QUEXjkE1SlxHmRA3gBXA52j/ZSAgdOfAFGv1NsPCY= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.7/go.mod h1:bQRjJsdSMzmo/qbtGeBtPbIMp1IgQ+9R9jYJLm12uJA= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.0 h1:51p4kCxB/9+QvBtg0KfwgTu10yiHuB9SrjbUE0d/vgw= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.0/go.mod h1:FtmZRmuRxdLBk4P/JcvZncfbwvLobQYktVaVAF8cx9A= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.11 h1:ltkhl3I9ddcRR3Dsy+7bOFFq546O8OYsfNEXVIyuOSE= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.11/go.mod h1:H4D8JoCFNJwnT7U5U8iwgG24n71Fx2I/ZP/18eYFr9g= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.11 h1:+BgX2AY7yV4ggSwa80z/yZIJX+e0jnNxjMLVyfpSXM0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.11/go.mod h1:DlBATBSDCz30BCdRFldmyLsAzJwi2pdQ+YSdJTHhTUI= +github.com/aws/aws-sdk-go-v2/config v1.27.21 h1:yPX3pjGCe2hJsetlmGNB4Mngu7UPmvWPzzWCv1+boeM= +github.com/aws/aws-sdk-go-v2/config v1.27.21/go.mod h1:4XtlEU6DzNai8RMbjSF5MgGZtYvrhBP/aKZcRtZAVdM= +github.com/aws/aws-sdk-go-v2/credentials v1.17.21 h1:pjAqgzfgFhTv5grc7xPHtXCAaMapzmwA7aU+c/SZQGw= +github.com/aws/aws-sdk-go-v2/credentials v1.17.21/go.mod h1:nhK6PtBlfHTUDVmBLr1dg+WHCOCK+1Fu/WQyVHPsgNQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8 h1:FR+oWPFb/8qMVYMWN98bUZAGqPvLHiyqg1wqQGfUAXY= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8/go.mod h1:EgSKcHiuuakEIxJcKGzVNWh5srVAQ3jKaSrBGRYvM48= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.1 h1:D9VqWMuw7lJAX6d5eINfRQ/PkvtcJAK3Qmd6f6xEeUw= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.1/go.mod h1:ckvBx7codI4wzc5inOfDp5ZbK7TjMFa7eXwmLvXQrRk= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 h1:SJ04WXGTwnHlWIODtC5kJzKbeuHt+OUNOgKg7nfnUGw= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12/go.mod h1:FkpvXhA92gb3GE9LD6Og0pHHycTxW7xGpnEh5E7Opwo= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 h1:hb5KgeYfObi5MHkSSZMEudnIvX30iB+E21evI4r6BnQ= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12/go.mod h1:CroKe/eWJdyfy9Vx4rljP5wTUjNJfb+fPz1uMYUhEGM= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.11 h1:jJ2dythFP5oNunvwc3gBsINl3ZPt/InVm4a5OAr3tag= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.11/go.mod h1:SNkot0zeLtgjP54/6BGuyG12pBcXi77jV5nbEsPgPzg= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.0 h1:sM+N/AhxM0oPE2A+8iTYQ+jtYw4guFv+M37NSN3IUNM= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.0/go.mod h1:AbqbSr5/I8pLape+l0cXw8huuLmmW6hbk+NJzPiV8lg= -github.com/aws/aws-sdk-go-v2/service/account v1.18.0 h1:+pXg+HCr8fs/Y+yLuiALewjJ17xluA3d4Y7MvY8Ntt8= -github.com/aws/aws-sdk-go-v2/service/account v1.18.0/go.mod h1:4BVmMMaWjTz/Qb4wgcGF9WKNB5xbUvbEYQ1dV28Cjtc= -github.com/aws/aws-sdk-go-v2/service/acm v1.27.0 h1:TMHvKbOxYvIOWQjKjXKGWYiLHC0PsWO90+5Q19jaZW4= -github.com/aws/aws-sdk-go-v2/service/acm v1.27.0/go.mod h1:yNwraJajyXG0CXINndTEJjBRe6mztLyGuwxXRR9Mhpc= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.0 h1:Wptawuh60SdMXHHVfKDj53JMHzzAS5M+TMwv8bI2RmM= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.0/go.mod h1:i1DwOkVvZwXG1iZZGoFV+dpM2YZXwD/iK62HRDMGnC4= -github.com/aws/aws-sdk-go-v2/service/amp v1.26.0 h1:0Jagg+Frwq6spIAqhlL1MGaiN88iNWIaNl7Tfi3auSM= -github.com/aws/aws-sdk-go-v2/service/amp v1.26.0/go.mod h1:9tLXwv/RtSeYC+dCJYE4ung6GVaWlBDqNgGBGK3iUqk= -github.com/aws/aws-sdk-go-v2/service/amplify v1.22.0 h1:PN8oZ7yRpzFAyx9iSX1xlwtxsWaIVvncW4iYisqGaDA= -github.com/aws/aws-sdk-go-v2/service/amplify v1.22.0/go.mod h1:eB7zMwDOZm527WOxYKa7VyHLp8dcVEUD9JpCczepKhs= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.0 h1:Cos+utTtPG8mSuYTEyetXJdYsRzSqN09Z4Kv/rDgf2E= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.0/go.mod h1:s7TCkwGkWXJCMGM1bxTU5v+mmtgfoPWE+hs8I9Qzhlo= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.0 h1:xyP23z+l970ebhCqrNbayxqN0w5ispKvdnaOeaXMNZ0= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.0/go.mod h1:mU2L10FRxydiAqsbOzaVq70Y5MHQohDwDyFw4Fu2GIs= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.0 h1:pQWQjXVrVyIXk2aWCxjhCiUmM+zIMfZdiyrtm9GAEC8= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.0/go.mod h1:IjrKbSqKQ0srC0s9LMN4KxRSmxv0xlePl/ORBtpMhWk= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.0 h1:FTpvnBAfIHc/sXTS+QiGgTRercCD/yIzs7jm1YmJw9I= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.0/go.mod h1:UeUkeICXydru3Efh6fktw5FiEs1hqg6TgvHw1ygJmak= -github.com/aws/aws-sdk-go-v2/service/appflow v1.42.0 h1:ey8eexxAmSeyC1Vu50DuMEoKzKePmbi9EHEJEeo/mW4= -github.com/aws/aws-sdk-go-v2/service/appflow v1.42.0/go.mod h1:T6e7RTxTAfm31RqbHJJRJs9aY9HJW5fEEmSMTeskI0k= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.0 h1:kLUWmnf29cThAQm7No0flo3BL4Rfk2sN+ip9eezjkSY= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.0/go.mod h1:FEhHqncLj7R+PU9QhAPDgMzwAsHGIXZ98rCedWwSfTY= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.0 h1:4WPtF/0EXZIca7qCh+FUJX3Y/8cQ74/e/OHPCGER3l8= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.0/go.mod h1:asZnTFVkzwvpaXxDG/A8GX8hHBHKlP9SxK+S4YTzWIs= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.0 h1:Ia8i2uaLSv4Tf4q/hpbX29RQFTTD5Y6xXoysx8kP6Sc= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.0/go.mod h1:ISL5+44fOp3YrbemFOPOQY6vMHwrpGIv2DUG3Y3ONXE= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.0 h1:vljpVeJryJTc7jf2mS2STCcQaAW6LQF3x5GWrmntbys= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.0/go.mod h1:zuRwtacIdGnoc0eEcpuG0VOhSsCG94/e4VBqT1KVJLI= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.0 h1:2mq4wcqtUnXRWiET9g9fb4BCM58u4k7cV40aKNFKMlY= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.0/go.mod h1:8rZ+Aao3XWYvbqtYCK3VjTnZvBe3DcT7KoVZxjSMg+k= -github.com/aws/aws-sdk-go-v2/service/appstream v1.35.0 h1:9L19kRzVtNUIiz0NQnvgJypzplJPG9JOEjBy/wyuN3E= -github.com/aws/aws-sdk-go-v2/service/appstream v1.35.0/go.mod h1:ATnlc2aY3z5XskWJEWKTza4/wpVPrOwFtJ9HI8Buv+c= -github.com/aws/aws-sdk-go-v2/service/athena v1.42.0 h1:Sr0bdGcjjjdbKnfbG3E9/yFA3NjfdqjMNfdYeWbeI84= -github.com/aws/aws-sdk-go-v2/service/athena v1.42.0/go.mod h1:icVkUXsjL0BclkZQGcj8HhOHhV8VXLHp+eRy0GPlT+I= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.0 h1:81lVxLdg3myFI+42mmuzde474/7ITz3Dr14h2XgH928= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.0/go.mod h1:GEg56OI9X8fYbWmcN713VVeY6fKcgK5TRnZDSy5T2fg= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.0 h1:TwUcxCwi9aILTyZ/Ua4Hxd6jmvzQHVyngMvoN35PPts= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.0/go.mod h1:7o4x9MEil/+SnU9vtXrLMLrEOrrR+jZxm4SsRQKXayo= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.0 h1:thL+4Wxgd+D4VWr9/BWFHVvaDWezaBC7ciRklNMkvgk= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.0/go.mod h1:xBZfNNPlWOEfS9s6uh8DFk/qeRrEFWxUdersMay5Tt4= -github.com/aws/aws-sdk-go-v2/service/backup v1.35.0 h1:Rslqrh+EzDX0dZIfgCZ61TEoN0wuksFmvS+MyO3LKvI= -github.com/aws/aws-sdk-go-v2/service/backup v1.35.0/go.mod h1:eNW1wQTY8Fy+Sl0meiqzuE0IKKbN3vBN6H8st2K8msU= -github.com/aws/aws-sdk-go-v2/service/batch v1.40.0 h1:jel/D32IZ/GID2mCCWOcvS5q9j+rzbR8flyOmgus5wI= -github.com/aws/aws-sdk-go-v2/service/batch v1.40.0/go.mod h1:Q4rnVSoW0d1+ayvXY9yyAtVCHYz8yXBys2PJmPFQeCA= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.0 h1:zJt5mo1zyx1l2lVU4HOTKYXWH/cw0Xc33rZtmg/TRoU= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.0/go.mod h1:sSLqjK2+Wg8fqOso0TNnHnD0IMaDwOWhJALolz84MDI= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.0 h1:wZRiGdDO5M5YgFtHlO0GkRND03oBOr44K2qdMry3biM= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.0/go.mod h1:9RHg4c320Tf1hxX1IIyJ1siGS2ry+B+7SqBkoybQ/2U= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.0 h1:pr+lctXgiRFMhm8M1+woYe6AEGHf6PHT0y6QwQDCyw4= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.0/go.mod h1:vorT3phLE0Jez8CRI60hVQCdDjzPxXohhErZOqz/uHI= -github.com/aws/aws-sdk-go-v2/service/budgets v1.24.0 h1:K+zmh8LUtZCnGGTf7mbdpgp12Rb+ZNm485tu1XxzwZ0= -github.com/aws/aws-sdk-go-v2/service/budgets v1.24.0/go.mod h1:TtEJrSZX2gBPB0KhgTo0OfmvpXObcOeHW/UE/6C2Kew= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.0 h1:z/npc7c0BgFzQXSVLw9FZFm2GAVO/B9luB/1lgUqZIY= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.0/go.mod h1:P7199G/FaCnRmyNJKhre84iGg8D0a5rIh8SksFcCs+A= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.0 h1:ESa6Z9SbR2b8dsMo6G8JIAt6wHgPV22LC/2M/ZAqMkk= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.0/go.mod h1:G4GvQuBcVMBqWh+CN6uPsqHRvssUyzsbj0IQGjapUFo= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.0 h1:tfLMmT43ctr13Bn67fTnVfz3gDbtei4tdJapNTeg2WQ= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.0/go.mod h1:BC8CIP0PsZAhUDixYPaZFx8VoeHrpLk5GrxXQfYa4CA= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.0 h1:QebHv7d+bOVJBy4W7GimKQEcOGbKDGdel1ZarIEUbVw= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.0/go.mod h1:aDektKdR9DtsOVmx2qZES53exu/JieOEE+RY02edx1E= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.0 h1:32mBVHktTOMYts6uLhRcmQKKObM5mCW45u/eVSawkis= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.0/go.mod h1:nI/COcoOpplZFJfSSkr9HkhwE0Zuq+Ar677fvfEyn0U= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.0 h1:TzWMznMQZ8NIfIpp7+QdqanvNMh/rYen3M/cvm13NO4= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.0/go.mod h1:jM1vnDSlhghsGirQ3nAwPVN+VBJs5f0ndAAqMEVshQU= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.0 h1:o4KYr8Mz5/6270WLfIq7Bg+s8BDzlqBeyoUR8WsNaJM= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.0/go.mod h1:mTlG5ftvrnlCepKl3O6LMvbj3BUSbpKIXoIFkKiC6gQ= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.0 h1:e94R6zDJ4r3VPvtnJERAGR6G1dpcA2P8gjMkvpV7KaY= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.0/go.mod h1:I2pHP163WgKrZYYUHB0TYqy0CTLaTXXPOjhBcN909og= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.0 h1:CxSxQho9OyQauJgWoy2ceyicHyf9m2+bZuSbcV8q9EI= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.0/go.mod h1:js3OHqsvjHfBGiR3cKxje/bu9CIbZ6kODi0AfRKoC2k= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.0 h1:jmiHtI0dyjUmlTieA5wHr5CD0OjFj5X48yqkFQT58Tc= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.0/go.mod h1:OnOsdWLQoghWto7y/M5yCvSuxI7zLyjbUBQE5R+D9P0= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.0 h1:EvxViEG4aJ75SYrbHy1AdNrxkOKF1Pu/gbbCo2uPB+w= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.0/go.mod h1:VfcR30AxMSIuSqrYLb8n3N2YitWfSqrmLiX0Cat0xnY= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.0 h1:SLgkiFKAfLqUJyDIZeNhfqExA3xVNP5zRzZqIKMTFzo= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.0/go.mod h1:ZoPhg3Mqkoqi5Z3+h8ArMfns6QxH1UgPLsi2WvDx9KQ= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.0 h1:mPSDewf6WAU9Csb5UvJbQjdTrh1YRqIXz8qSI7ZjFvQ= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.0/go.mod h1:DI/WW2qdeZn0yFmzR/JZqxCEI/kPPV7CMj5+j6IEsyo= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.0 h1:lFn5aoo8DlyBWy2FynTLPSlfdjdyPN/y9LYb7uojWXE= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.0/go.mod h1:eFPFaDAUICetgvWBzn0jH6D5zu6/+/CbtuqlaGFSMrQ= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.0 h1:3jegt/XwhjmG+lweNnn6o+3GUWohGDB03JT5Qyhjy6w= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.0/go.mod h1:5pydPuwwmrII/A6KAwA+CzmTOegfqI4etP2efFxdVBg= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.0 h1:z7A3wnYlRMPAaL/3rgOhfunZNgCkxYxWeX+IrBLNdEI= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.0/go.mod h1:60OtE7cK691Mwi3yzgjMsK0p/fox2f2ABxb9I8tfRqs= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.0 h1:xyMh2lYk7iXCbrdkmErQiXCrIR09gSMS5ywYhBRPNmg= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.0/go.mod h1:jjBzkVPPhrZuyXg/Fzxz8YxBjCw1kTVoB2kH3cSYIts= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.0 h1:tVN59Z3FGpGh4DMv/qrgsjplKXdm5NrHKpIVvvTgwxo= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.0/go.mod h1:9wxPodN0jhDQk1X/hiWrvQSCgIzuwTc+5zY/tLStRJM= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.0 h1:+GRYZ5t75fFMudQOW+IGH6zxaEy8NQQtt+oK9m8JbJY= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.0/go.mod h1:Q6sDZXeOksdwhHVQ+aKMMos5eoRV/BdBEBufkclSyBA= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.0 h1:C4lbzhM44DVeKSTYl5/mpRLdAx2mlsq//Cisko5LUzo= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.0/go.mod h1:cmA9tSWcBVnogTkJ9HxXr4vmgvLJ+J0wy3oBRbnKMIM= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.0 h1:cJgrzf0XSfwyEfyMd6pGBAXLEuWrpbaAdX/gm5i0c/M= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.0/go.mod h1:mKa4tKUsRWgMnvtDnvkIbOlGRlHWxM5S3ApXs4oZzC0= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.0 h1:v6PeeRF76JIfftHvIrBXApPmj5TF9ZgqoZaRgEkXpHo= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.0/go.mod h1:AeH5FpEbbnjaAk9kqyJVk2eH9e0XLkHbI40fEF+hjpA= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.0 h1:hMxeMa8aEe0DsAF+KgHkINyJ1qeiJ9pqL7xb4Q4PuIc= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.0/go.mod h1:yYtKu78blthI45EdP2M6dbgLImAr9glsPhUFRdGcs3A= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.0 h1:q7gj1bSG1S1AdtUbxmMJfMSBNTB7lYNpOS9F3rgLOxo= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.0/go.mod h1:Epw+lxzb3qOMd+3gZhVuoh7S13h6BXP1W1dqWj6ANm4= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.0 h1:dYD6qKzSwJKa1/z0ZKp/82l5OaRHz1kDgcyPxR8RRK8= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.0/go.mod h1:GCf4z4EUKj4Y4N5kxbJfa+l//qsgbbHDe1dj+1yYT4E= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.0 h1:lbxacb9zGdGOLLVNN/fE1NO5ppYS6tZLNMyvSwU3DiE= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.0/go.mod h1:sY0SMZ1KRagJ2ED5/F8S0A0oPz1brRzJnXF/gkvie1E= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.0 h1:HfCj8YhWHZzBGWwSBIWsRUyuaVcD0l3gtfpZZLu7Wko= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.0/go.mod h1:/PxDjyK/SWyUdk5mrq663qUeAdFjOyAVWQ/q0dNcZZI= -github.com/aws/aws-sdk-go-v2/service/configservice v1.47.0 h1:U6EQANOy4eB5aP93NBhgBo4XAlVy/qf6CTNTZpvTUVA= -github.com/aws/aws-sdk-go-v2/service/configservice v1.47.0/go.mod h1:io3I6nvqdgD1Nq2x6xK0leLo+IsY2LsQXxFrPMZBYfs= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.0 h1:A6GY24qgYzvWAAs8TyLmyrvX05IKsMtOPCFy/xu/BTE= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.0/go.mod h1:4g9AskDE1lsSbaHVkLCn+6vYai+u+agS7PCd9+wQzLA= -github.com/aws/aws-sdk-go-v2/service/controltower v1.15.0 h1:bSxrwYKhquIB85XSZ4yhVjdDx74tzY/97O722vAJhko= -github.com/aws/aws-sdk-go-v2/service/controltower v1.15.0/go.mod h1:CFcv6L4uZ+mpY5bcbJ9HHPXTjBG9BpIz3AOTSpCvdqw= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.24.0 h1:HQI7FIQ9lSI5JpXMBwG6NQ/CvgUEQA4dcqvtpZ5grkY= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.24.0/go.mod h1:3yHlvQo34SVrOeLt2z+XmhkBla7cl9PPnNbkH/09UaU= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.0 h1:Ybb0Chz4woaBvA5zBg5BkLflE7k19mUNNnGfdliCuFw= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.0/go.mod h1:M0zVr8zXYjiaPaJxzCdjPSL5DTzPDqD9cwxIqRCweTY= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.0 h1:/sQS4Bbg7o0FT8sgTigUyjupfxeaNPy+aiCFYTD+9Pw= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.0/go.mod h1:1rwIiJ8X0cE5Z/ohGae7APa/y0WnxKmMLM+Qro3Y2r8= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.0 h1:Mysy3wqQ/8WZ853AL2Q6uEIMkyxJ2N1DLqeAFdirXns= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.0/go.mod h1:25enS+qI7PKn+dIzAvhXH+0b74F5M6bxVL1Dbu3Yqrg= -github.com/aws/aws-sdk-go-v2/service/datasync v1.39.0 h1:lUNkpy/yBLaZOWEcQfIxD4A2V1QMXSHHtPWgU0WFkjY= -github.com/aws/aws-sdk-go-v2/service/datasync v1.39.0/go.mod h1:GDwumRrPG+UoXowosbT8ISPlywOEbeq+whAdap2ROzo= -github.com/aws/aws-sdk-go-v2/service/datazone v1.10.0 h1:67U19JujMHzGz3XK0ScEJnoyW8+nh5c4V+sMVTyw1p4= -github.com/aws/aws-sdk-go-v2/service/datazone v1.10.0/go.mod h1:l5uHXSeaVLtPNDHVtgk1nzjjwf/+BwcpXgON9gckMvo= -github.com/aws/aws-sdk-go-v2/service/dax v1.20.0 h1:f3MqW79KuP3qHavzUZK55OaP5GC91Xgu5ZCx0oN+tUI= -github.com/aws/aws-sdk-go-v2/service/dax v1.20.0/go.mod h1:crF1xZ0UuNSBKA9n/GZESG+AcLeHutdVrrRvEKW2sqM= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.0 h1:K9wGwAuzW472zGzdk4ERM0wNXvyWk6grlVLlJlpwhgI= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.0/go.mod h1:doNhXXr3bB+0nzrBU5aL9MmqR/+63f4LTvDOTDn+9Jo= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.0 h1:UMzMSn+nZ3Fi/RvCzCjYmx19Ny4zJeq8vOJh5+e3MnY= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.0/go.mod h1:aQ7PIqC5CXP5kp2bYZWavDiqyopZKCThO0PXGGs7PBM= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.0 h1:4u9ThMW+3Wnab1KDLVrHO/1V8RoyWgCTVlr2j5kgryI= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.0/go.mod h1:FyvpPxwx5ncLB8b0z7sqBECy614PP2F2KqJC1kFyUxE= -github.com/aws/aws-sdk-go-v2/service/dlm v1.25.0 h1:QPV1oGvIWQuvfm4D8kU4kI6WNuQfHTJ5uA99I/cOhp4= -github.com/aws/aws-sdk-go-v2/service/dlm v1.25.0/go.mod h1:CTM0SjMDpZOBu+azuk1Mw3jC5UhPwq4MrO0pPHtBEu4= -github.com/aws/aws-sdk-go-v2/service/docdb v1.35.0 h1:XU0oBaQK9KPr4yP0ZtC4g/5yOOoaCNcnPB6m3E0YfCs= -github.com/aws/aws-sdk-go-v2/service/docdb v1.35.0/go.mod h1:tguc8Z/5tYRQ/zTREVtoGjTp1K9eZdJMqN0YCAagBXw= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.0 h1:32T80uFHi4ZMWpUXYpjcQLzGfRONpVagB1G+VbxYUC8= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.0/go.mod h1:7Y6c5EtsLSYirM00nWqsJg/fIfboU0L+AfwMICufcJk= -github.com/aws/aws-sdk-go-v2/service/drs v1.27.0 h1:5/H3aq02wXrDhncP60kSbUoyOTGPahR/t3dW9c5Y4YU= -github.com/aws/aws-sdk-go-v2/service/drs v1.27.0/go.mod h1:T+TlvSk14iPkBLujzsTEaPZ36cOyaz2MLH1ttuIwQCA= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.0 h1:PkT1xMKymZEvR8n5WM97XdLWwxQGxnDrqMaquPLI0UY= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.0/go.mod h1:IpoHTdKbzTZUkF67mAGOcqndO7LA8yzMF9FbJbeAKIk= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.0 h1:FQpJS76mmmo21FZn9FAutjAIxotNkiGXUYfUQN/RfGA= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.0/go.mod h1:+dDvvbkwmJCZGzsSlsqEtJ6XhyG/hD2FHjIfpqcNl+o= -github.com/aws/aws-sdk-go-v2/service/ecr v1.29.0 h1:5eON4rBQMHFTX7thxv4EQpRrombmiMsv3+wCEPewk+c= -github.com/aws/aws-sdk-go-v2/service/ecr v1.29.0/go.mod h1:2BLsspQpxT8gg3dM6G5CZGXhrE/EpX8PeL2lsZ0zDKc= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.0 h1:5F9MRX4tyEdZ8L+7op99b+ie+1bxaKCf+i1QlCnochM= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.0/go.mod h1:Q1viq/XwLL61fNLG8k0mZmDEvHaGn98QcNewkxHXDSY= -github.com/aws/aws-sdk-go-v2/service/ecs v1.43.0 h1:efgv9/bmag2npefcjkoLA7LIN2CfoUh2l3Zory7mhkk= -github.com/aws/aws-sdk-go-v2/service/ecs v1.43.0/go.mod h1:30V0YAIaqPu/zgtVeuLmUht809PnYNOK8PUov7YE0fA= -github.com/aws/aws-sdk-go-v2/service/eks v1.44.0 h1:+nNKonJ9cFCp07GTRc4ftQcw1Px/dyTvei1fHTpu+5M= -github.com/aws/aws-sdk-go-v2/service/eks v1.44.0/go.mod h1:l3Ce8Ls3SoCaqheT2UV5qfDw2Md+xCvjEVmtI+9ynpo= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.0 h1:g054qAZjl0D2ISEUYfh1EvDV2Z6g8s3X606Q9iV6r/0= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.0/go.mod h1:AKYnQqdlH5hq65hpj73kZvAIu2JZnaBRxsGsu39JmM8= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.0 h1:luQaJXM8g3MRZPEbMzQ2ut3dx6QnG0sO1OYIe5VPCR4= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.0/go.mod h1:72t1RRQNbuAt0wYiYmw6IshZETm5gkmr75zFrZopFLU= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.0 h1:iMTooAw0vUOiY6byiaVQgtFUE2GsudZ9DTJwnmKb+K4= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.0/go.mod h1:7dAQkaiNMiZGo0h3l5Il1v9E3eiqKW3DugEQmmJHoqo= -github.com/aws/aws-sdk-go-v2/service/emr v1.40.0 h1:hWsQlAEHgHJIW2gkW+d+J4tPqZ9LRGBkvInZ3Mje9+A= -github.com/aws/aws-sdk-go-v2/service/emr v1.40.0/go.mod h1:5xmrleryUdXi+uFipHwKiDgUwIgZbGXn6hs7PZjnZTQ= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.0 h1:vW/D2ptwtnwjALuTz6FU5yENgTmFTH+3Cgsl43rDbMA= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.0/go.mod h1:ea+Ml3AQot2+q3j9zK/zyMaL3f1HoQq/wc3vR1FPTh8= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.0 h1:MyjnZtMEPJrI33u9+HPgqhFGi65sj+UOpfttPnoLQ8I= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.0/go.mod h1:MCMQtekAJCrg/M8lJrKVoVbsMl2MAU44RCKLdE5tQ4k= -github.com/aws/aws-sdk-go-v2/service/evidently v1.20.0 h1:QdYEs3DC8oWu4cV8FnrLBZjFFrW5vDrTpeUxxOsUQJ0= -github.com/aws/aws-sdk-go-v2/service/evidently v1.20.0/go.mod h1:sPuFaQ/DeK2FsJ1KzyLj8sO5g2IV8+0V28VCVk1hk8o= -github.com/aws/aws-sdk-go-v2/service/finspace v1.25.0 h1:FelLYQ5vrVsgI4r3Q1hJJfKYbcRaj7kncgncF+sCm+Y= -github.com/aws/aws-sdk-go-v2/service/finspace v1.25.0/go.mod h1:rSCRrHyvoKMZxPznz9FMC1lwK8DE4qLURw2rzMiEEMQ= -github.com/aws/aws-sdk-go-v2/service/firehose v1.30.0 h1:xDay+EZfe0OZKrx/Wtjhcweie3w+m01gpyexTebEA6U= -github.com/aws/aws-sdk-go-v2/service/firehose v1.30.0/go.mod h1:GST/Kf+NkoLXbC7wXkaqnXQV1F/Pt6ezlK8Sza3QdDY= -github.com/aws/aws-sdk-go-v2/service/fis v1.25.0 h1:LzC+g87pqfTlpT5779D86/jp55HgqjyLFz49aI8bkNM= -github.com/aws/aws-sdk-go-v2/service/fis v1.25.0/go.mod h1:gApaUrNvjKaFimyr9E09MaCHTN6N2nRtApRVS3rYb7A= -github.com/aws/aws-sdk-go-v2/service/fms v1.34.0 h1:btGAO2JhzkxagPmb6u4oY3UdxQYeRJv09rVSj9YObqU= -github.com/aws/aws-sdk-go-v2/service/fms v1.34.0/go.mod h1:pzeU9c8sSZiL0SlAjY/jFBvsYDZnk052Rbq+E/NdcHU= -github.com/aws/aws-sdk-go-v2/service/glacier v1.23.0 h1:aq0q+CifJj5URlsqSdZA8+LeSCl+RkxXZYEu2kXkTuM= -github.com/aws/aws-sdk-go-v2/service/glacier v1.23.0/go.mod h1:Ydh2fORQhB33j3aeqFzzRqxyFJdr1j2a3eoAH9jJ348= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.0 h1:9P29s6K5fEDh1oOgjj+FRxYF1IwI73+vi7wycuy/FKA= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.0/go.mod h1:BAqdH8ZBbv0JdKe7r9DxlU/FmF4WGIYEsJuV6g4tIf0= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.0 h1:IrOlyBLb6XjB/iz0NoUSDjLCUYCHKKVxSrZUExb8tZ4= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.0/go.mod h1:gdMcdxtsqAvXMXqQpRmq8p06d7z6EAHb8mAP18K7duU= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.0 h1:1sIp9dUD3J7rPIHS9PvwJI7mIWtFP6e8RHy+RiUQZFo= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.0/go.mod h1:tfSfErj83MbzhHCZiUT/h5Pgz6HTAn47ZdO00icaNnU= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.0 h1:hmrbocHNj8wkYbVx2IQ6D2GMBfbbqZurALwI7O/gRCA= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.0/go.mod h1:3mevB7W93YhBpe7d4SW9jxiQdg5dlhL8U/r3sE1loU4= -github.com/aws/aws-sdk-go-v2/service/iam v1.33.0 h1:p2xoaDPoghFBgtHndpM8//LauNkAU4/SXZn6HSfl4qM= -github.com/aws/aws-sdk-go-v2/service/iam v1.33.0/go.mod h1:mycyYpCERRrn4zwk6/qOtnw5poVSrDb1pHY+RLPfIkA= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.0 h1:qEAorzngBK3F06xk2s6tJRYJW8iCQM9YS0AA71ZQ9Ak= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.0/go.mod h1:kO/aFGBHyBYc3iZZM/V6o1CX3KwmKL7dLOkptnVLz60= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0 h1:X6iYhpr/T3elhQ+Kvnx8Hyz+cZMtTWb7OPQc8OU5KtM= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.0/go.mod h1:P3o/FYtRp9xLTWmIxZHgiZ7IMFc6naXeBeZANkms7DI= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12 h1:DXFWyt7ymx/l1ygdyTTS0X923e+Q2wXIxConJzrgwc0= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12/go.mod h1:mVOr/LbvaNySK1/BTy4cBOCjhCNY2raWBwK4v+WR5J4= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.1 h1:xiBxyVn3snq4T4ULkhluYUDouVWa0/bvCacJaaW5Zaw= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.31.1/go.mod h1:joyQCMQ4RuIAyFlaxemD0fvhbfv+A+j8OdMUJHpyxWk= +github.com/aws/aws-sdk-go-v2/service/account v1.18.1 h1:GRinAnafboH983+FkLjFO1eMOa3+TcgjQvqb0JMDE4M= +github.com/aws/aws-sdk-go-v2/service/account v1.18.1/go.mod h1:E9NGq+OLfDPiiLj3cl+4srGmNYytb/UB2DPEGvEhAQI= +github.com/aws/aws-sdk-go-v2/service/acm v1.27.1 h1:EMnuoQ/WR4/VNE8QmFrXq4u0BZH2Xhc9Yr41xZlths0= +github.com/aws/aws-sdk-go-v2/service/acm v1.27.1/go.mod h1:wHw2SsqkXuys0SArqz+Rb7LGvujWSnlPByxCm6q7kus= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.1 h1:FAk92O6prrubKEZOPq1EaB09B3G7crDIrmSiRdcQDrY= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.31.1/go.mod h1:5GKFDOiJPtkP6jyRx8AB0vRap2JYPyD5pKJQALHIn9s= +github.com/aws/aws-sdk-go-v2/service/amp v1.26.1 h1:svGkgUKZDc5SNSiP6BgcOe/6sPmwBniltU6uHmxrjqo= +github.com/aws/aws-sdk-go-v2/service/amp v1.26.1/go.mod h1:mBtHxQRTrzQB0G5oap7IcgP9Ny5p9BJSGhWnuQ+35EY= +github.com/aws/aws-sdk-go-v2/service/amplify v1.22.1 h1:4ViQJ+tm0D5a+aAdJlPsw+tsxAxbN/ChdbyCWtVRnPg= +github.com/aws/aws-sdk-go-v2/service/amplify v1.22.1/go.mod h1:IlSHwknO6vYVWAMPddUNS+RIJEFDawvLl9NMmMoXBgU= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1 h1:20jy3+l7bQA6tJ1nJxg8+l+1Xm9KrDslNVvc8HvLoEI= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1/go.mod h1:gcUX4UmbhON3+0ij28aojD7vaMPqsRYFefqwxCLbUnw= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1 h1:qbbxz47vQdGzvLeHS8xmvp3shV0n8cAnmred+Ehj6qQ= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1/go.mod h1:3tgssMs7RA6rZoI6K9w6Nc6gCmhadTFAOU+OXh4tPkQ= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.1 h1:h2JzyyqbvuXD2I0HombM5CsbmFbB3jcVeF/WhX8AjCk= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.30.1/go.mod h1:rOJ1yTzhpIWjgop8XniA+nanxF4jpyUnLcX1s0gaShg= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.1 h1:TbZ4cm8Mvw+auu0xQk7m6iFg9p+uFC97cUzYKZObt/s= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.8.1/go.mod h1:9QTxY84kkzjBDUHp8mErDspSgpA6e8A/1AvU2AvYJ7I= +github.com/aws/aws-sdk-go-v2/service/appflow v1.42.1 h1:zxPjTkoh8wIgVg/R7NCG9t5X7UhZjAf+RrL49J9uv3g= +github.com/aws/aws-sdk-go-v2/service/appflow v1.42.1/go.mod h1:rsZVlJIXpHihdPFV4ehYl9nO3VJ61ido6ccJGXVFTYQ= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.1 h1:ubkE7GDCrVnbeQXCSYdKd+yLdyPlnNowDgWKifhNItQ= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.26.1/go.mod h1:TewkvUJ7j870qbp0WQu+JcGEprz+ts5eSw/2qabcIqg= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.1 h1:ANEJvQOBqUqBkacz03QaTZoievYqZ6BGSFsTfS6LEEQ= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.28.1/go.mod h1:yS6PzOMIdA8mF/UCbekP9fRHwd9AdZpBuTfBShvOgG4= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.1 h1:TtRLnoTa+KzpQTtfxIUNmTPd4afNXpTMenzkkna8Xhk= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.25.1/go.mod h1:KNQm1mLx1brArm7jx7ssJ1xTczUkVj/PsDEJUfam1Q4= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.1 h1:4f1B5azmuPT6Q5wWxjf5U0TJzAH3st8wP5gfxz8l49M= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.1.1/go.mod h1:ihPVq+A4BcK86La1KEUY8mM0k0egpal2f8SMhBeLIIY= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.1 h1:ZI0Je1AGcU4AM3xMsMsA4xgrKzNgFSkQR/w6Ihi+rZA= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.29.1/go.mod h1:RWEXpKx8evWnba3DAfAupnzlM2ejdWNBOII/udFrJlg= +github.com/aws/aws-sdk-go-v2/service/appstream v1.35.1 h1:wlll0kVBQVfZB2oNqDG1CooV5xRezoYPQ0vUvxnf8g0= +github.com/aws/aws-sdk-go-v2/service/appstream v1.35.1/go.mod h1:qLT0nQAYhXj8LLa7fmLvx8nYTRIQ5y+CH06QfU/CPic= +github.com/aws/aws-sdk-go-v2/service/appsync v1.33.1 h1:zbMPXMPrM9hYWySGW6xm2AA4GtBmhqU+rYxit+8vJis= +github.com/aws/aws-sdk-go-v2/service/appsync v1.33.1/go.mod h1:t1V04AJ0mgXsmSkac1UpykISXNIEr6Gkgx8JgYpEKpk= +github.com/aws/aws-sdk-go-v2/service/athena v1.43.0 h1:9gG6ddaduB/vNXa62sI5BSXXZ6ohbN6zYrowdKeOLxU= +github.com/aws/aws-sdk-go-v2/service/athena v1.43.0/go.mod h1:IgZ3BPAIcafbIEndBsCEZSo559W16aD6m6sRcGO97gM= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.1 h1:0vWu89NdYkrqiXodXViT9UxT5WO70ZsZ4gQme7UQzaY= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.34.1/go.mod h1:9AVNQ9gOvNkX8AzDT2lXI1iZkL5vqbgv+zcNRYL4bVI= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1 h1:ZNokD9M3On22Qscssyi3iQAzkoeOJxnE5NANNCzPzIA= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1/go.mod h1:5XY8CFGBv6dZp/thbk8FRIAWjqNckM7PsL848KHdzjI= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.1 h1:YHR0n0eUY964ffHangUAvM/vjJUYoj1058G4/xoZG+c= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.21.1/go.mod h1:BltrhZlEEwdnaSFsqZUiZA7tJk4Ie9JQ2P1r1qCpsIs= +github.com/aws/aws-sdk-go-v2/service/backup v1.35.1 h1:JDoVIgC8dzbc1GBH1rYQYcovRh92RDIrywal3fZrQlA= +github.com/aws/aws-sdk-go-v2/service/backup v1.35.1/go.mod h1:443Jou0o4i+ea/y6mOvo8zgIkvXDJ3pdCWjZ/YFfk5Q= +github.com/aws/aws-sdk-go-v2/service/batch v1.40.1 h1:khjAF2CScjXDGdCKZqkB6W95os0Ro+b/CFHT5nGQ+nU= +github.com/aws/aws-sdk-go-v2/service/batch v1.40.1/go.mod h1:9B+DcqWg4/hcorXHhkK/ZT68/LgEcWwlvlWXD0XAGoU= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.1 h1:UieVxA3h0rBI3DisJ1dFhRlR4lReFx8QkMPD6lIB6d0= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.4.1/go.mod h1:4Zm38MntGZFvQR6CPPC21lI1TvT94ZVEdEi4xBRnHZQ= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.1 h1:e2FZRSG0h0nA/sdRJJXtOnbMXPvAFUoyRNWG3oTioyc= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.9.1/go.mod h1:4e+Wd418o5s7L7NChi9vWNjMkJtm/yi6NmWy5efcACk= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.1 h1:DD/97H5KizWQP3Dj051VHjObCpWtAThIjMjoz71kn0w= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.13.1/go.mod h1:IFBd2ljkmZvNdvCS/0IDWQ1/zSkebKueBo7+IZLre54= +github.com/aws/aws-sdk-go-v2/service/budgets v1.24.1 h1:idyO38YS22rDYGpk/1vusjuHyTt3TepwjLPAhlzeBJU= +github.com/aws/aws-sdk-go-v2/service/budgets v1.24.1/go.mod h1:9WRJ9/p51FEA92MA9pMZkDN2h5YBHcVU/hFqq8E/2c0= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.1 h1:WlvYO/q57AA6zvtFKiQAtsWqCHeG1d9wlhDGUU9f7tw= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.3.1/go.mod h1:/h+o63KFyzK+/JkYgChKyjVJHgC61vQUDixoXedtRd8= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.1 h1:/ig2xIYS5wtZtNQm2JvcJEk2MHf9Np09nM7Qo81xMAw= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.16.1/go.mod h1:K7Zis8oztyCOfruXbrO07OFAdciHATEpuQJ6flJPgyQ= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.1 h1:03VekFsZgpSMWICYT8j/pdOxSBQjN1IYmRWuZeYMiFI= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.16.1/go.mod h1:Cj5LyJm1YKQZcJ7ZL82TEF6KZnjvnCt4Tv+DAl7otHM= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.1 h1:WRpeBgByda+zUWmca7DKsI42exYNYqoLjKtn9HC82Ug= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.13.1/go.mod h1:cPdw/jsG/67Lcgfqy/LJ/FzguR0HUbxEKBQDixh0LHc= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.1 h1:mKH2nvCvTExFQCEWOjXfMtuF7y6bAwwx33JF2GpzsLk= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.25.1/go.mod h1:v2nyYCd5sx1XwKx/1wUuEGa97kbdrqfGXTlmg/w6lyg= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.1 h1:xje03QCAf/8b1Ntsx/QR4oTn0tMIshVT/OUAilcwcO0= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.19.1/go.mod h1:4hiczFeqZEQy8yX5/uY1rgXKnOXam6GAoWZrFEfoyMY= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1 h1:Ts+mCjOtt8o2k2vnWnX/0sE0eSmEVWBvfJkNrNMQlAo= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1/go.mod h1:IrWhabzdTEc651GAq7rgst/SYcEqqcD7Avr82m28AAU= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.1 h1:oOm9MhuUpAWAmjcXwkTsYBzXzFIDbVYje6P5jPkG3kU= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.37.1/go.mod h1:Pri+xMTktTIOpTg/yYeCYgk4vOrv6sZLcB467ePRIoU= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.1 h1:kMR6y3b2eXF9NzHqGlH3cDxC2S6KfuBXJb5+m++KWLo= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.5.1/go.mod h1:aXg8JNvonDQbjiNPMSZ5G5/VEH1ZJSsM8u2tFKn1dbk= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.1 h1:SmnVTefyghNfnuGXMnJsHEYn2S90RCpUlOKf0e2YnMI= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.23.1/go.mod h1:iqbEItGSpoAow7uFw27QZ6qylNKKa94QP8UK6tjzSq4= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.1 h1:fTsQs8LBzM87p5KJdJAfF43VMMWFPFcD9HuX//D6kQ4= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.23.1/go.mod h1:C0foT3p9IlsG0bMtL0457lvntFeu6Qgt9VumKlI7zkg= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.1 h1:dSDDTrkL0JUsAtLxE4MXeUlDHuSrYz+S2h/5/j2AHDQ= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.41.1/go.mod h1:t612HtnZuwt6UkB/JMxewOHaeRI5VklfVj6UcwOwfCk= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1 h1:U2qFeD0atfYsNMX7pVPvTG+vI7jCoelcWomOK7F8b34= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1/go.mod h1:6cstKfQIguQDuWrHKYhjod025+J7n0AR+azv5t9HYBY= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.1 h1:9S1OsS3TCTUwBcK6K6EUYKyEb7sc3lNvf4KJY9WrMfQ= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.36.1/go.mod h1:u4Wxjs4U9OLN1HDFLAFTnS0mDC8kh23RCV8ctQSxpT0= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.1 h1:1OfXVziIGFVm5FHvDkWogdHUkXlZZwqe/0LCbxnmfYA= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.28.1/go.mod h1:XKoFW8gDY8bULuq8+sKHrMqsbnVi9MTkeJmf69ZxoLk= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.1 h1:bnzjHm+ogGF+ldBxE/QX4LS8EdmvVmo2crELrUH8Vko= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.39.1/go.mod h1:8M+F8tdWjmhBbEBrYZNEIqyaewVROyMpGbjAE0ezzaE= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.1 h1:/VqrREr150QUHg2sT3HyXruh75wgxNF/ovXJrNirwHo= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.14.1/go.mod h1:ssdLO5gMVtYjJywV9Qif/BMcJIF7TMrygQzP0FjZsJg= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.1 h1:fUkMJntkDjreA6z/OjWu3Yo6GgflOb89MwJqkiKIhLc= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.23.1/go.mod h1:owSVfGgLWi8lpG+Ek9ngwErdBD9WJJJCNGYZDEb0JgM= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.1 h1:heUpqHgpEb36T8Tz2T/YgIhvGyrosFMniRcZ1tysvew= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.26.1/go.mod h1:rCdAG15aLhGEozOHpWNOEV3ZsT3FWDaOyxt2Vm+F2H8= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.1 h1:kVltQrvq9OLClU0dErOa8X+oCup2MAnwYraJmIP12c0= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.21.1/go.mod h1:dHJf1FKp+UCZB8TzqD9It5mtH5bAgiJUPaw6NsCr18s= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.1 h1:cWPRG82xZJvCPgWxU0whZ8oiKUPkZdDFSyWNNCq1pjk= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.26.1/go.mod h1:SLJpIkjNr4PoJp6i2gdclwswNmGkBsp2mx2+dfy7DKI= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.1 h1:AmUVmQ2xPDib5oF4EgCx7+YW6RETtbtFfxhGbHi+EB0= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.29.1/go.mod h1:na6xq+0NoaHlXbCYTRvrULaHmLNSByUleyJy9euDhtQ= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1 h1:wxAB1UmknXKQcaJ3/NYLERUJ7UMHmjAxC79qSDZ+gzE= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1/go.mod h1:2tYDH2oM9SobFKK8e1Tld+gNzFBoJ1tJx9BFE5WVd1Q= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1 h1:Y6zYm5uoyV4eJyhLWyZ0CrMG7oGiGu0Q0AKDA+FInFk= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1/go.mod h1:eLxEKHbDZAZ21Kd9MoiVwTHuKNBfYSNgqp9IvtqodsA= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1 h1:grnSpw0UYD7mZpV4cbIrHroG5geUkLdZG9Nw6y+2mY4= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1/go.mod h1:GjlJPEWhuchMZu+5ANvFJ40v2D/Yf15GKtSQrEii9g8= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1 h1:aaO83HGlxNkzuusYpfQKLb5p8Nh5fT9Z0AZGOMCgV0s= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1/go.mod h1:sceZD+zPJMiCXh57FxceWpqgNsNWST11mkCKKOxPzus= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.1 h1:YcD0FWopQ45wJls0DhI7jxEZ7eyupwep0rbRVKIILS8= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.35.1/go.mod h1:l1VImHHo3aeITpaaUdoeWkUwo6rCKz4Nc4oRYThfP6k= +github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1 h1:w1ARKEDr+JYVWNgAJQtZEYI88FS8FKv9aVdg7K67ri4= +github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1/go.mod h1:ExWsfT5TTjMkpt5HfiMCozowniFm1bxIZi6Z2DHjxGM= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.1 h1:i6Gm6+KRs0TXIDETJzGdqol+y0Q02/2swZ0mtVFwTnU= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.18.1/go.mod h1:3I7C4pcZ++MDSDCHDkXEF+jGqs80Ggi4rnCNn/m0SHA= +github.com/aws/aws-sdk-go-v2/service/controltower v1.15.1 h1:QD/r0AtUhuGca+6P5dRFNrGLdhYEHttfCj62CoaWP48= +github.com/aws/aws-sdk-go-v2/service/controltower v1.15.1/go.mod h1:LVHPyB4s5aE7rvy2BHULX+2C2b8GTSwX6oAcBoDuYcw= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.25.0 h1:W9SVpLBFNnPgQtMQbGhlb6+VjsfITm0hBYLK0xMC48E= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.25.0/go.mod h1:1tpevg2QD6gPbSIPaWZFsyy3r/u70iJqg0uUHrgjOG8= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.1 h1:oBVbeqeAVABwx7nPjHtrkjdWCsKw32zr0kem/ObNqtg= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.39.1/go.mod h1:NqSDny+Te4J9JM5IyrP0aywQVU51U/T7H9wZN3AQfe8= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.1 h1:r1eywILs7CqOrHlCVk+VzRN+dakDAFLG3AP4aFpMFz4= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.5.1/go.mod h1:U++BfU7vu4wWCcbgEYJ1U3tGPhYS3yFmns/IcUyQQCU= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.1 h1:Q8qaVCxMxlq/dtyhsxeem0coJpHCt+yiGI0wGhdxXlg= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.37.1/go.mod h1:lhwc41j8YUBkPGK3VpX8+Ze/xrltyjVIJRJBerL5KVw= +github.com/aws/aws-sdk-go-v2/service/datasync v1.39.1 h1:uxWLMp0jcdV4Y4geESJoK/sRJZ5UR5ZXbsmO80o5G8w= +github.com/aws/aws-sdk-go-v2/service/datasync v1.39.1/go.mod h1:avtAoHgeYzxVtm41THxtBvtIYGwEiORu1qqOx9ozx9E= +github.com/aws/aws-sdk-go-v2/service/datazone v1.10.1 h1:uXlr3EF5ahh6++5dHGmAsYDe42uP/0c1Lcf53XulTlQ= +github.com/aws/aws-sdk-go-v2/service/datazone v1.10.1/go.mod h1:X60rbZ2iaL0HHJLO94rPQZVVd9nyXV+s601q/8zCIT8= +github.com/aws/aws-sdk-go-v2/service/dax v1.20.1 h1:TsVZKgA0lRq/tARfiabTJpxDp4SvhUN9oaGp6ysvsl8= +github.com/aws/aws-sdk-go-v2/service/dax v1.20.1/go.mod h1:GNQa0lb+sN8wYxvVveXs6NYj7QE/ln1S6Zq8vdLvluI= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.1 h1:YuAiH2QWZQBW37X1MtgZmS+vLVAZPnfZKcW/5b7LhGk= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.23.1/go.mod h1:K8JyqC+I7Itibe+jCmhUvk4SKjuImxIVEDRD+FcgDE0= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.1 h1:GocOtSzQdS21YCifZ9tRWrOfXDJ07zxNrng0sA3lWmE= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.31.1/go.mod h1:cBYCVQQq4hoCGXmrFB4Ydp8RLiJQydstjQ6rpIWW77w= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.1 h1:o73eXOlXE32xnr0Dawi5gzVLbdeVfYnQlKwqbbvTCcA= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.26.1/go.mod h1:+1wFFZEpA+srGWrQRLcXBLvpK2AaAAIyUDzu/9XNP98= +github.com/aws/aws-sdk-go-v2/service/dlm v1.25.1 h1:PfGJEDIwkbHdha9Tl1bVea77oLyx40ytCYuJh6sm+g4= +github.com/aws/aws-sdk-go-v2/service/dlm v1.25.1/go.mod h1:fzgnfuz0rPeHLhymW+pQGStjpxyBj1Ejk4AjG9YcPZg= +github.com/aws/aws-sdk-go-v2/service/docdb v1.35.1 h1:ONQmD3KEK/HEN9Fd+DX97tN4spsRb8EigGX+Q2hkefE= +github.com/aws/aws-sdk-go-v2/service/docdb v1.35.1/go.mod h1:F8EZZZUOZ0QNB1wiYJ5LQuzQUvXg0RPfMkZfYVglEH8= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.1 h1:GUkKn+uh75Hy8oXWSZV2cffzYiOg1jSmoKVSRNOlfRo= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.10.1/go.mod h1:FdbKmJnx2hriStRrPI7xrFVytgWoR0mVYPSLyZ/ftnw= +github.com/aws/aws-sdk-go-v2/service/drs v1.27.1 h1:iA5bnw47mK5BGe2bvk0JMwa+hrU5QI3ailkfospq26o= +github.com/aws/aws-sdk-go-v2/service/drs v1.27.1/go.mod h1:mADrs2xVSpoXKhmqO7etp2NgsCqvA/Si7tMITr7mnEk= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.1 h1:9UiObaZsmKoR1k/dE6z/3laTkhkV0xnYXT8jIpMhuz8= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.33.1/go.mod h1:zU5eWYw3HNkPtcrFwBAdMv3+h3dFpmB0ng7z8wOuSPc= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1 h1:LkSnU1c9JKJyXYcwpWgQGuwctwv3pDenMUgH2CmLd1A= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1/go.mod h1:Wv7N3iFOKVsZNIaw9MOBUmwCkX6VMmQQRFhMrHtNGno= +github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1 h1:ywNLJrn/Qn4enDsz/XnKlvpnLqvJxFGQV2BltWltbis= +github.com/aws/aws-sdk-go-v2/service/ecr v1.29.1/go.mod h1:WadVIk+UrTvWuAsCp6BKGX4i2snurpz8mPWhJQnS7Dg= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.1 h1:Eq9i/mvOlGghiKe9NtsmeD9Wlwg8p4fbsqrMb3nWirM= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.24.1/go.mod h1:VtOgEoLEPV1YADuq+Z2XOK6/wKkGW2YK6DjChZ/GvDs= +github.com/aws/aws-sdk-go-v2/service/ecs v1.43.1 h1:Js5l/9hBLI4/enHaCezHxxoC0AQ1kh+h9TBjZEFIg1c= +github.com/aws/aws-sdk-go-v2/service/ecs v1.43.1/go.mod h1:a0NMSy8O5qyPn5Z8Lf0z/vyXry5Z60Vw23fYD1oRu/Y= +github.com/aws/aws-sdk-go-v2/service/eks v1.44.1 h1:onUAzZXDsyXzyrmOGw/9p8Csl1NZkTDEs4URZ8covUY= +github.com/aws/aws-sdk-go-v2/service/eks v1.44.1/go.mod h1:dg9l/W4hXygeRNydRB4LWKY/MwHJhfUomGJUBwI29Dw= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.1 h1:XUOyv5Q0uypaCKkv1svwnhB9X76sRDoLUelBjzlFrL4= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.39.1/go.mod h1:RHxzPy8YHOOIEFxK5WYIsDA8TEDIBd8A0BenmqV9PKw= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.1 h1:JQpNrllBoHIKSzwLVFK/XYsUJBhDNvIaYVBQNf/9vk0= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.24.1/go.mod h1:JuMMy9DnDaLMb0pYz4v0kavMGRd+Me6kn5S9KWIUd4I= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.1 h1:whB9mAd0jcYqVF75rVASYdPPBEfZwGFLBq9rz0cHCoI= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.32.1/go.mod h1:EjPhusEHOS2hFIJFR3PfI4ndJLkhm3VKTWv0U5m+VR4= +github.com/aws/aws-sdk-go-v2/service/emr v1.40.1 h1:wH3N7EEy/KgQFvnH0qnrfAECHvlJ6DPiLlNJUgZEZO0= +github.com/aws/aws-sdk-go-v2/service/emr v1.40.1/go.mod h1:mw5LOzaQgE+8Oy0dfhvHeiZTZporvugTccq121K12PQ= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.1 h1:PxYDKli6t4c4ZR9pUhdva/5c3ssvNvzmqoNFZxFQJG8= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.22.1/go.mod h1:sufrIA6wP/EydjURB33dtQreCXBm4ENL92tw6u6MmUU= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.1 h1:CC/texhRBbrlvDnholIlzoCXIPacah42iMJ5Qw17ZQQ= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.32.1/go.mod h1:3j+pcA1J4w7o1Sgt9maYlr+AXL6qPLjkmM+9oYTu+8Y= +github.com/aws/aws-sdk-go-v2/service/evidently v1.20.1 h1:VQ3R9AC/NnbJTYOG1t8leoOU/lZ5MeF4Wd3hKG1TCEQ= +github.com/aws/aws-sdk-go-v2/service/evidently v1.20.1/go.mod h1:bcnYJJZnP2/iAYSYBZr757pfeusnDvsr/w/nxYjLSu4= +github.com/aws/aws-sdk-go-v2/service/finspace v1.25.1 h1:AzE9MtNhz2ShTfmv0E9hAbCEiQ0tbLbi6MJ8G3rBLX8= +github.com/aws/aws-sdk-go-v2/service/finspace v1.25.1/go.mod h1:wFw2JQRHqId9j7TLuud2hVySpj3Kl2FyDTzk11U7VlI= +github.com/aws/aws-sdk-go-v2/service/firehose v1.30.1 h1:rUjrt0TdN9J3fXoAR48jQYPZG9CuTFFx8sRvNeewsFA= +github.com/aws/aws-sdk-go-v2/service/firehose v1.30.1/go.mod h1:OfHMrSBBxqqMlNKxYS+qN1iEIlak7LmjQokzFocNdEw= +github.com/aws/aws-sdk-go-v2/service/fis v1.25.1 h1:3QgBUXHUBlAR0C7U4NnW06AOFCu+k35NLNQebJ/ZFi0= +github.com/aws/aws-sdk-go-v2/service/fis v1.25.1/go.mod h1:ZNsquchu106IZ++PAiwBDjmcOeALzBSPMHKNgwnsFwg= +github.com/aws/aws-sdk-go-v2/service/fms v1.34.1 h1:syweqXph4uS8LY+MjwsSt29N457s1U/4B/9OUE02fI4= +github.com/aws/aws-sdk-go-v2/service/fms v1.34.1/go.mod h1:9tSGhVWwdYbj0TKzLzvZpsEwRCdzcVi/HC4YNKEsLQ8= +github.com/aws/aws-sdk-go-v2/service/glacier v1.23.1 h1:nUOHgAUOnQth5+fMWgCQiOEqH73fgqmueimUYJE/7rQ= +github.com/aws/aws-sdk-go-v2/service/glacier v1.23.1/go.mod h1:29ythAZEVnLPIOCpzENgCzvZLoAHt8S8BHryPpm8EyI= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.1 h1:7C51ZbOLStv+VJwdiKGzJeKK0LPX6+XTJv199Q9xe0U= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.25.1/go.mod h1:VSQN6t3mMZfL/CEC2sg+MaSDv7A9sTFFhIB82k7zexA= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.1 h1:XTtOVIG/v1yaff76zGqNLB9LDW/+hY7dQTuwvh4y5Qo= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.28.1/go.mod h1:GF6S/WXbeYIIdbsIAKsYdEvndnn8wksiolvsk27TaBo= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.1 h1:0LOU9mO7AI2rjuuO9p8iymDR3jhY91d+P7XEjJkaa7w= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.44.1/go.mod h1:pqOGHA5mcb0tdNBQq7QjwhyXebpFvflQ2eU36zxgctM= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.1 h1:vehsCmdxi8vX7GK7ft1hlU0ZxTzbYnew192DukNngCQ= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.25.1/go.mod h1:WzKPsp14R9Vt2jhmMuZ79TMmmv/CnEVz3bI4eKRst7E= +github.com/aws/aws-sdk-go-v2/service/iam v1.33.1 h1:0dcMo3330L9LIckl+4iujMoq0AdR8LMK0TtgrjHUi6M= +github.com/aws/aws-sdk-go-v2/service/iam v1.33.1/go.mod h1:sX/naR5tYtlGFN0Bjg9VPNgYNg/rqiDUuKTW9peFnZk= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.1 h1:g2WNVRtXDsxOA+VEMXXzw8gvXFdUrkXehiFsPFzSi9w= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.24.1/go.mod h1:XnTkN4iDJq8dN7VBZZDZ5NOEup8V3s/POj4uBlSy574= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.1 h1:MrCy2Qee++yNI4t0adjhDrVi9xKhpPLiweIUy9HwJIc= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.27.1/go.mod h1:5FPrmv5Cwaq8Fri4puvds50dVPMgGZlU5inTlDs1UJQ= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.13 h1:zmKtGN1dMQDVBsfCePykMQmTfWY+jlaUTv55RF5b31w= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.13/go.mod h1:1UzMv5n56AjbPR9834o5YLw5dH6baIsY60Ib84s1NCc= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.12 h1:IXSDCqEfL4oe4plEt0GkjkuI9T3tbVH91udMp7ZwV20= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.12/go.mod h1:47OjVuK2ib5x+7RLlacLxhZRlTnjlXAwal1BSXwj7Tk= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.13 h1:3A8vxp65nZy6aMlSCBvpIyxIbAN0DOSxaPDZuzasxuU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.13/go.mod h1:IxJ/pMQ/Y+MDFGo6pQRyqzKKwtGMHb5IWp5PXSQr8dM= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.11 h1:QNkz5KqOUdeq1D0AP9r7Af6hNKyb0fnFa/L4DEKTp+Q= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.11/go.mod h1:c7R1eDLOU5hQ4f66TYzyAT2AeLLtw5khZJpbGCo1cYU= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.0 h1:qhosmDiiChXUik7EonQCa/Ar86wkN+RNJtrvw038FBc= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.0/go.mod h1:k4kMkKa2GC60pwx/7o9Lo1FafY/IweWPzEJDly2q5Q0= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.0 h1:tat1j8oYFZ3U+RjCPAsG2v/EeNA0tjNFFN/vejX7mYI= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.0/go.mod h1:6d4tg8VqAxfgtTKzz2dJMvIWHrW+l0naowqFqVqxcjU= -github.com/aws/aws-sdk-go-v2/service/kafka v1.34.0 h1:07HKBDj5blE+fyVtyf1WEihzADVfP9dsdt2b22VPAls= -github.com/aws/aws-sdk-go-v2/service/kafka v1.34.0/go.mod h1:cFxsTlC46RM+GLxW922zvCPnV3p5ovUm3w/pG2iO+bU= -github.com/aws/aws-sdk-go-v2/service/kendra v1.51.0 h1:I8uZn+5HgbBpggnM2RGbk3u6izgQbi/TyatI3HqkZiA= -github.com/aws/aws-sdk-go-v2/service/kendra v1.51.0/go.mod h1:wiwrggxiDODtt1K/GizZ/rk6qZbdayC6nkvCT8Db+g4= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.0 h1:aVZsfw2eRODAto3hjFSJJhp89yQHt6pk254nkc9X4tI= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.0/go.mod h1:hljEHeYMeOpHEAt8JfmTPBhgu1UECQR+LIKJohUS0fA= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.0 h1:GlBz4i/73k7KGfgv2RV207nl5GgHEPqym/pZp/f5Oho= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.0/go.mod h1:CgU0Lb1UkyogQXjSZ97CI4HRc3G0Ts1+ZTNFIPAfkHU= -github.com/aws/aws-sdk-go-v2/service/kms v1.34.0 h1:GKrvkdgKYFjn5XMwzuuN+e9St/TnJwJl2rEisSfP6r8= -github.com/aws/aws-sdk-go-v2/service/kms v1.34.0/go.mod h1:AStnoP2Hj6IHB5nHbVw2mEiGjLpOJPxY+XOc2xcKTvU= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.0 h1:OwdIAzsPYUOCkkhCey8NDOJo+SIvfkIvyDeUhaN7cOE= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.0/go.mod h1:64y5I6zkuDp4//8B4gC0aMaigXFzuZnCMTXZmilApvY= -github.com/aws/aws-sdk-go-v2/service/lambda v1.55.0 h1:vrwMgAOU8ZXrWs0QZOOAFRdWFNxoL2DdH4doD0BkmU4= -github.com/aws/aws-sdk-go-v2/service/lambda v1.55.0/go.mod h1:ZVT/r5NG5Fxjaw7rgDmOYVu0y2KELlQCcda/f+yypUQ= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.0 h1:KWPToB4PQaUswu9OYsizvFBhANLrjZQcgm+reIDIhAs= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.0/go.mod h1:POsVs9pgDb9GcDnU28jI0MYcJ8dmZXa69drFSWv9j/4= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.0 h1:aOjZLUohIyhQAa55T5YbADhbSD14shA3Uy9iFaMkLNA= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.0/go.mod h1:o5ds6PGmBWFEalpuvHogbw/eWsTRVoWwSoKYPk8JQzY= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.0 h1:nuwAO6+IALIMkohEh60AYmoMLyOHwRRB9jqmuA9Cu0M= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.0/go.mod h1:8ufD2bOz/z8yVDnlaHqy9ejN9UUzjwjSLxAwHkHoshI= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.0 h1:5xgnUWghApxJQjFglJ4YzHddQuhPh9SXJpLfI4TKRQM= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.0/go.mod h1:b/iu0Uj2AdaFrGlaGX8/J3O5lmURNPaH5ogZZTr64gU= -github.com/aws/aws-sdk-go-v2/service/m2 v1.14.0 h1:DFwW52UPdLPUqPx/lzSNM3U/E6NJJLlahyNh+x6AL1o= -github.com/aws/aws-sdk-go-v2/service/m2 v1.14.0/go.mod h1:V4zGgD3V7LsrsD8Ce+dkAw64+o86KjLa+fL75fxPly0= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.0 h1:A63CzSzHPkVkCFkpU56Da804IDNpay5TbiwRrryheHY= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.0/go.mod h1:HlbpoiCoiec/aSqe19eep/AWYHDOwDg1zBSeBpgfPLo= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.0 h1:Xah+rTdeRrUzz+/bxMp8fTjwGdgxv/kek7myjnkBkAQ= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.0/go.mod h1:8zjF2Dt1bDZJGqfLtqoRMllSkfyiHaanYvkVP7XW4Pk= -github.com/aws/aws-sdk-go-v2/service/medialive v1.53.0 h1:TrESOVo6H5c7ZtjKp1Vf7hfL0UqmqmRJYiIbqfwT9lw= -github.com/aws/aws-sdk-go-v2/service/medialive v1.53.0/go.mod h1:Nw5GLwYZvqZ6dV/jbnzsObMzpy8/Wk+9LvABHWtZoZM= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.0 h1:hnshAIgbRHjGKVnhp+k6lBHhBgkW/z8dy3HkLnjgzeg= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.0/go.mod h1:KjnRZNMI89hQn1kvHJAKW6ZiiSfb8eCFMAK1RmEhU+U= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.0 h1:fp+EzoLjY/IEyNI+pvHyn/P7EP7ReUXvhVxtNGkHArY= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.0/go.mod h1:GP1Y0gWRh63ZrCgNTep18xMtfJ+UxvQh3ySWeP6dwTI= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.0 h1:v8U8FO3M2QjA7yTgC9oyD64A6I6h9AJfApgTB2xvQmg= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.0/go.mod h1:Zm+Mm7zDSLiJMmrQAckI0LS+u5k/isK4wHM0MCbexYk= -github.com/aws/aws-sdk-go-v2/service/mq v1.23.0 h1:7PvX/V1CmtXt/gvQwBl2yM4bbw2ERLZGXmotTAacdpY= -github.com/aws/aws-sdk-go-v2/service/mq v1.23.0/go.mod h1:s6bdv+6LzsWAQCi2Xu+WEi74KpyAT65pwbdGIub4LvU= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.0 h1:bKi7qpSkeRbkpWHCwlAgMMXnwYu4JqfzyWmob0N9tbI= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.0/go.mod h1:6i04FP47GX97vfirLHyRGHyzDHsDyhz0m+wIEv/DfeM= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.0 h1:6c6bLYsKD2/IhHDlbQKC6LfsHbN1olRDdBPJdwCAKlE= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.0/go.mod h1:hRUpppMdU4Ez82Bv44GhZ0lgwWjbqoxk4rlj+MoIIFk= -github.com/aws/aws-sdk-go-v2/service/oam v1.12.0 h1:NyYwBx/auaIYoPvHUPHUpE4p5jzaFqhL1qmxfk9+HhA= -github.com/aws/aws-sdk-go-v2/service/oam v1.12.0/go.mod h1:QmR858iis15nB1JSbLooR6zK+ZC3zZfwW9bDdv/taAM= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.0 h1:K7v/cjRbKXWy4qJDtrZ9D+N7Bcv1YYgiV0u8p8a++jc= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.0/go.mod h1:BUJisSmzHH8bDzBUuS8oibm+tTkabL1edIok+oaXwrA= -github.com/aws/aws-sdk-go-v2/service/organizations v1.28.0 h1:tm2U9o4/Pj6Sj1WYshqyTr3eF0sZviLn/UIElhyeBTA= -github.com/aws/aws-sdk-go-v2/service/organizations v1.28.0/go.mod h1:gsyCAmtG8IgmzfqBQiduGEOhBrIVAZsGv7S4rCvXFRM= -github.com/aws/aws-sdk-go-v2/service/osis v1.11.0 h1:DO6ZBGQ1e8dkEO/dyFBfCfA3EyhYvUpVSsNNvZ1WlGc= -github.com/aws/aws-sdk-go-v2/service/osis v1.11.0/go.mod h1:NnA7zLCoOx+mhlSrIJjU/rtThQOcrTPch5shRttwTds= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.0 h1:sA2XaV1iNxcrLysD9S2c/m/aHapZl+DenPCX7lWgHdU= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.0/go.mod h1:R5vo8yPCzJaUJnKYDgUdtvz9CGTXPfI4KZ1ebwFN+zA= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.0 h1:rWpuyP9zpzrMw9av+5Yhc+vCYWBW8LoQmd3D9ODFrco= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.0/go.mod h1:v/8Whq6U3QgxFH/PRElHRVbQz64BRaGVq0FDXfUksRM= -github.com/aws/aws-sdk-go-v2/service/pipes v1.13.0 h1:dCbHGnHY2lcM3oR3dMJSGN/X+QykH7m5V0JGpcmLRMw= -github.com/aws/aws-sdk-go-v2/service/pipes v1.13.0/go.mod h1:WyWitPfg1KQr8e1VCNJKlMENK1RWQH60LYNfOKRsmRE= -github.com/aws/aws-sdk-go-v2/service/polly v1.41.0 h1:4019JiZsZ1RkUzO3Zh+tlAqOFmS5LTxPQ9ZzVdXxpWU= -github.com/aws/aws-sdk-go-v2/service/polly v1.41.0/go.mod h1:d2gHPwQLpV4GJ9VOFgRHjPHtRzR5sT1X+cK/c9+ES60= -github.com/aws/aws-sdk-go-v2/service/pricing v1.29.0 h1:EV2bGIhwWstC+xobp+dqY6SkXkizoIf/BOm2rlA6Oj4= -github.com/aws/aws-sdk-go-v2/service/pricing v1.29.0/go.mod h1:ybiXcXGCPNkoeZ0SWEhW2YqAuof+VoFaY92Hmt9wEZg= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.0 h1:08Sqhl9+MFQSvAjdaqrmkEnEg4owTYH8faulWkfjawk= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.0/go.mod h1:fE5HSf36IsNrPZsx3eSnTRrXPILIHAZfVOmYL3frUrU= -github.com/aws/aws-sdk-go-v2/service/qldb v1.22.0 h1:3IhtqPixRMbRL2hszlzFUjANJrK37XyIeSJcPB27U0Y= -github.com/aws/aws-sdk-go-v2/service/qldb v1.22.0/go.mod h1:4hd2SxINA5DfjEnSXOTVKIDfMBu3f3f8ix/Awrg8xZo= -github.com/aws/aws-sdk-go-v2/service/ram v1.26.0 h1:xOXgRYmVnffog74K2oOdmpF4AFGuxvD5sf4JoblH9/E= -github.com/aws/aws-sdk-go-v2/service/ram v1.26.0/go.mod h1:VSstQuq+G3Snk52pK7hxgW5e+/aRPBAHXVf8HokEyDY= -github.com/aws/aws-sdk-go-v2/service/rbin v1.17.0 h1:MwHcvJqUyY+U38k8cREkl49Sj1f4uH5Th6VrDcXqfjk= -github.com/aws/aws-sdk-go-v2/service/rbin v1.17.0/go.mod h1:omAuKAoQMFWf8ZUkd+d9/apTKhIiiBVqbkDH9LogoVs= -github.com/aws/aws-sdk-go-v2/service/rds v1.80.0 h1:8VoBRoKh2paHslGSveRqxSiPnFbXfiYxBG1/EzSDzC8= -github.com/aws/aws-sdk-go-v2/service/rds v1.80.0/go.mod h1:yLcoHSwyRp/AKOXNQUGzdF+u3zfNIco3sx+j5AU7VL8= -github.com/aws/aws-sdk-go-v2/service/redshift v1.45.0 h1:/UkJsgFo45+8hPrHTOwOnKotD6nCaGbrqQ+Q+yme59w= -github.com/aws/aws-sdk-go-v2/service/redshift v1.45.0/go.mod h1:DQY+HM2caihCnHUIHr6W621GBD3SELTotJ2X/y/0rbg= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.0 h1:9XGFu3yf8TmjxD8l9V5G/+5LFvy8bcc91YTaWMzW+aA= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.0/go.mod h1:EjEwXgwEm6KWNVBnzTf0CoJJcbm/lCvQgJL5uAXVZiA= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.0 h1:GbLcRmDKU3ZWJyjHVUMZVQKHCulQCgnvHUQHQ4XfVSM= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.0/go.mod h1:q3rWe+TdHxcC3LAjI9MD0o95xCMuJcE9nRcA4E1nYI8= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.0 h1:qTjv3yq39ZDWuFxSg7VthLkMPB6415pN95LbsHrQuGg= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.0/go.mod h1:62kYN/bu2HmN5D4DDPGEPp2RSk88DBkZMmc9BN6W1aU= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.0 h1:FdTAqyJJEQNaLv+gQqSWHmcY8vysdcMy9fOhOIRaaSQ= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.0/go.mod h1:P7I9alD1m2weZzSd6C55oS5bb3IB4ou1XqEhE1W5pug= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.0 h1:joVrhKXPEIDeFoF+QDwGpv7VTRoDuMLCEs/u/u+ctBI= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.0/go.mod h1:yYz0Ti5szl4rvf7hiI9FsYPf22Vjy0No4k7v7H4Ms28= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.0 h1:8zPwiUeRAMzLU5dZ+jL23bTVoy0TdKJyZ6LH0lOKzZU= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.0/go.mod h1:wp1n/0IPV/MOvs/sgqlwhdd8TsFLWC1ggUCNpicniDk= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.0 h1:PkRTzjDe1p4NjpF3jlexR8SqYse7FCZ9F2irAFT4/RY= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.0/go.mod h1:GGzMuBJGT+INpSiVyJDD/SP87wRW+Nj1lEFSp9tyhxk= -github.com/aws/aws-sdk-go-v2/service/route53 v1.41.0 h1:tvIBVabBmCMZvPFtT18HQbSjskzVEcSvdJIAjLQmP78= -github.com/aws/aws-sdk-go-v2/service/route53 v1.41.0/go.mod h1:rJl5QZ1ntzfPi2g3u1p8LQk78tbKj0JNmaNG1a9u97A= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.0 h1:oJ2TcKRuwWuFwbwCH/ocaLP3EpCTca4B0wqNb6PopKE= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.0/go.mod h1:L2ps9ionyOaplG4vh51jyIRUK+xB7vjMqnObxXsRoK0= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0 h1:+RSaYW0xatoiE7wGJDcgwRjfZt++9GLWzQGExrCsfDI= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.0/go.mod h1:b93TJwGXxTHjsiJ0atSd1B1SS+t+f0reUP1NpSm5pCY= -github.com/aws/aws-sdk-go-v2/service/rum v1.18.0 h1:nSB1+P1J8uhiktco2Q2YHS6QKnmvUTMxLQsi8ToV6fA= -github.com/aws/aws-sdk-go-v2/service/rum v1.18.0/go.mod h1:uF2wf6A021PjiTu0/JUkme349nPtPSYHHtxlustC4QI= -github.com/aws/aws-sdk-go-v2/service/s3 v1.56.0 h1:NZIFz15bhrWwewGU0tdUGsisKPQxvzy3O4dL5jgBDKw= -github.com/aws/aws-sdk-go-v2/service/s3 v1.56.0/go.mod h1:ha/DkVoeDtS0XwRKyOiXP2J4Vzo3zpiE0yGi7Ej0X3o= -github.com/aws/aws-sdk-go-v2/service/s3control v1.45.0 h1:pY/fn04jwUb3WfjWNNGdt3uAT7ZwBx/qz4S5gKWvfpc= -github.com/aws/aws-sdk-go-v2/service/s3control v1.45.0/go.mod h1:6cnOOx7AsrCBX6NlwKmGYi5fz385yqFJxQwBGMDyc6A= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.0 h1:rS3lP/TQoPU2rnw3edOtSkvTtOQox64KAeTuArky5cg= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.0/go.mod h1:iq8U67MA8PgyLvjYbALIXJTtEazl1nnlJOlfxKx7VkA= -github.com/aws/aws-sdk-go-v2/service/schemas v1.25.0 h1:i4RLQp/sF2ej3Mf+ylkSWsjQ+LNZehcGpb+di3JZ9ac= -github.com/aws/aws-sdk-go-v2/service/schemas v1.25.0/go.mod h1:h7U1z78PLCbVBZyHNFrrnQaLsBl5jS9HBFKZUfyAY+M= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.0 h1:ZyB15ar3Z+zYlFbg0p9cRwu8MjanG70q+wR8/QI/Ehw= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.0/go.mod h1:hLeitfWsmqj2EFJWsXyz4GSpqG/aqrHXSd4lCH0q07U= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.0 h1:DjIkaU2Y4kwx3steK44v6zoo5BNS5BWq/CK6VeFXVOQ= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.0/go.mod h1:OgnzWiYEqZl+wyDa3tNNLjodrEQoHATqSsf5retzEsk= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.0 h1:h0Hc0HeqRiCdQNxFuN5/T6Dyk8WmJ41ys42ikIRBozM= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.0/go.mod h1:80i7dDYRHz+6goSHA9aYAAKLsAgF/YG45mtBkQXLu9I= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.0 h1:McGMz1MxHynEh00FRagW/NbSf6JjW6XtSBky4DWSeWg= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.0/go.mod h1:LpcM0C8kqecwfaNeK7yRlyOt0gLuzCYwKcnK39ADOsI= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.0 h1:FCRBlq0ym8/3kr5/tQKLg7tsz5nTOmdqtArNWdvAdNA= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.0/go.mod h1:w6z+TqchBg7RF3FtvUGs08faCSYfwlbGf7x5ipuWDKU= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.0 h1:J1RxKkbJvOydBLiNGR1T5HUjJ+Qjmh+n4p+V7Cpkhn8= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.0/go.mod h1:XnoYordEM2qP1jnnHqMsm55wgdm0VubxjUu3UKiB6ZE= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.0 h1:nDUPSj4veXxQuuX2khp5rW3bvyZZPnB0LGiNjSKz3Jo= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.0/go.mod h1:xpE4aMOs0Lby0U2ymdxGdON1soWCmqK8wOIWBgb4BZ4= -github.com/aws/aws-sdk-go-v2/service/shield v1.26.0 h1:SgqIGzWtN2CY53hi36SVmZ4Ygtu6b/E2LETPpnvarfQ= -github.com/aws/aws-sdk-go-v2/service/shield v1.26.0/go.mod h1:WRG9BjqyyYMcN8Z+MpQDdE1qDdEn0YtLxksG60UJDjA= -github.com/aws/aws-sdk-go-v2/service/signer v1.23.0 h1:RCoquPxZDbw6PJV5rgV04HgcOPSja1RDMcJf36Ssnlc= -github.com/aws/aws-sdk-go-v2/service/signer v1.23.0/go.mod h1:cMnMMZdfAEsZ1XeUOYC3rKFnK3a6G53qiAljLUvbuOc= -github.com/aws/aws-sdk-go-v2/service/sns v1.30.0 h1:Xq0gjRipdyccCsbojaEGsqUzD7N8j/911+ga/mS/KOs= -github.com/aws/aws-sdk-go-v2/service/sns v1.30.0/go.mod h1:2VCr8FDGRUdGmTpcKWHyziQnfgJo0ToZYvFflybzxAg= -github.com/aws/aws-sdk-go-v2/service/sqs v1.33.0 h1:7iapmBjPo27AGV5MnJZK9xN2TDScmy9YqYGBb0+9rQA= -github.com/aws/aws-sdk-go-v2/service/sqs v1.33.0/go.mod h1:Ls5D7SrhpvEuUmmQs+cbsguHYQLyeUGHtu0pBl3AqHA= -github.com/aws/aws-sdk-go-v2/service/ssm v1.51.0 h1:RJuxHYRQquxK8vDzCKGwSNOPrfZlu8bLRSLKZQXPpT4= -github.com/aws/aws-sdk-go-v2/service/ssm v1.51.0/go.mod h1:pBcd0Bm+W3KEHKQHtPg7cK9dsP+2gvDaQTYrqXqk194= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.0 h1:wA7oJ7pxznRmpGzrrYIKO8y0n+WIzklHTWBo32iN0OY= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.0/go.mod h1:xzt1f/KRs/6k/nlcOw34T9CSdPgCi4veERocWz488EM= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0 h1:z9+1A3GPG1fK93uGvonnGNR5IrfGL2uv23FlhqZ5nPc= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.0/go.mod h1:/ZlBCvFGploAXe+70lJ5B56ZiFsMJ9dtKjVl2nw1YSA= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0 h1:hPwOshVCyWuinI9fAhJsY8HYl9EvPX8VfoQvUyxk5Dw= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.0/go.mod h1:UwEu2wMK9SX1hpj5a6Vvq/xqFHq9iDdkvOXY8yzlw/s= -github.com/aws/aws-sdk-go-v2/service/sso v1.21.0 h1:P0zUA+5liaoNILI/btBBQHC09PFPyRJr+w+Xt9KHKck= -github.com/aws/aws-sdk-go-v2/service/sso v1.21.0/go.mod h1:0bmRzdsq9/iNyP02H4UV0ZRjFx6qQBqRvfCJ4trFgjE= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.0 h1:EqRK4n81uTTWxi337dAtJ0hc+y/bb0BZmdvsMIQnO2k= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.0/go.mod h1:PwPJuZ11g2G1p93H7eho8tDWF9dKeKC5LSdHoQiMKo0= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.0 h1:jPV8U9r3msO9ECm9geW8PGjU/rz8vfPTPmIBbA83W3M= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.0/go.mod h1:B3G77bQDCmhp0RV0P/J9Kd4/qsymdWVhzTe3btAtywE= -github.com/aws/aws-sdk-go-v2/service/sts v1.29.0 h1:dqW4XRwPE/poWSqVntpeXLHzpPK6AOfKmL9QWDYl9aw= -github.com/aws/aws-sdk-go-v2/service/sts v1.29.0/go.mod h1:j8+hrxlmLR8ZQo6ytTAls/JFrt5bVisuS6PD8gw2VBw= -github.com/aws/aws-sdk-go-v2/service/swf v1.24.0 h1:YgPeQKzzVAaWRtwj/ovFoEnihwwjYz8M0Wi9OC33btc= -github.com/aws/aws-sdk-go-v2/service/swf v1.24.0/go.mod h1:2d8TknRULCwm+Z3SRJAc+RKXH69TRaKZX3tra+atvRg= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.0 h1:Y/GdHJ3dQughvff9znLmc0ll/z4XKq7AFt49eS9cdL0= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.0/go.mod h1:SUij8hDbgZ1D1gSyfM0DlaJ0MNn8lMNyrwXPGzVzoeg= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.0 h1:6MJ3GEx2SfeIgJ6Lz9drlWSCAIlFY9FB6q4UaJWjW0k= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.0/go.mod h1:MQ2A6JqwaOyHWZ9/X6aLasQzwENEh3lrN3S4QQABGQw= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.0 h1:O/DNMp52fWip+R6+r7Gv2mM5nhxP7yguQAaubSn/PvQ= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.0/go.mod h1:kNfpzthakWe9UqaJqCXAfAfTtNahf0u8nHvn4I7UQFo= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.0 h1:nvNlvVnfja9AxLpPis0inO6TfrrKE8wJn9ie1b43PCE= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.0/go.mod h1:/maZhUhTzl0CpiFVRphpvolzHafQbUxb6KiZ4zFmLLA= -github.com/aws/aws-sdk-go-v2/service/transfer v1.49.0 h1:UXdzHgO6jsEpsFOyOpAV6DoBExpiESRqbbNwHG4DKIw= -github.com/aws/aws-sdk-go-v2/service/transfer v1.49.0/go.mod h1:mNpqi2+uajhgdbbTQA8/REXyccSTy8+oDAH9LCy4fWs= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.0 h1:vcy97DbO72iIUHLhoeGUSwQBgwESRz0/RE6ori2qRPE= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.0/go.mod h1:KKWkumFpy/2QsK0oMNLVNhTK8Hj30DNeQ2kedEsW6u8= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.0 h1:AjgOeauxg/8dA7+xM2CuxrJmAzDQgiwTGgfrXtJznuo= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.0/go.mod h1:GVgqis1OIPeYVZo9/tC5P6TbO+eqPj6j5AMBLJocKgA= -github.com/aws/aws-sdk-go-v2/service/waf v1.22.0 h1:VF0/BiT3DB/Evkf0HUdPrjuGz5mYAj5MRNM+XP57Yy4= -github.com/aws/aws-sdk-go-v2/service/waf v1.22.0/go.mod h1:zEuwy5BLf2Ax04YWoX+aOFQldspfNSw6cOzh2c1FE9o= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.0 h1:BoaV3DB54jcoeaXpa0cS/0AYbGND0+pUinh78WNEAsk= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.0/go.mod h1:tcc5r0O8/SAAZ90CgLsFJuu+YN06mKOQTBv7BvgSywA= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.0 h1:+R3R+PHVgzeN6iQ7y8aBX/4MPYDmDmd0DfFV1xfYdNk= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.0/go.mod h1:W5X+xXQU61asHCukaIpOuGjfOy8v24iRNES44MpIRBI= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.0 h1:acyDLMysdSfKfQJxBENybpz10ztsLITWza447ip6wII= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.0/go.mod h1:DIUvkoJg5kC9K4j342eAK6anceSNNUO7iwa2vhYsBsc= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.0 h1:rk4tLvt53j6msxrSS2tn2pFXPo4Q2mj7Kt5HAnPKFQU= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.0/go.mod h1:ARJ/HUyRaIhxIiym/cCJJ6OqBowtZNh7jmVeTPPqrjo= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.0 h1:KRE7Xj1nVszmqd6fCLO5FDSl913kA3O8Z9eHJ4F4YBk= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.0/go.mod h1:5d3kNhMcAt3bG+iJ/XOOMJrXLN9Cls07mGxoqln4dFg= -github.com/aws/aws-sdk-go-v2/service/xray v1.26.0 h1:pP/IrtNrY9zP1aBaXoy+ebt7qJ9fDIS/TP+3IT54+/o= -github.com/aws/aws-sdk-go-v2/service/xray v1.26.0/go.mod h1:2Hhdl4R0u2M3H3KnTXK8VPQSt0QSyFwW1eu7WW6bOqw= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.14 h1:oWccitSnByVU74rQRHac4gLfDqjB6Z1YQGOY/dXKedI= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.14/go.mod h1:8SaZBlQdCLrc/2U3CEO48rYj9uR8qRsPRkmzwNM52pM= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.13 h1:TiBHJdrItjSsvfMRMNEPvu4gFqor6aghaQ5mS18i77c= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.13/go.mod h1:XN5B38yJn1XZvhyCeTzU5Ypha6+7UzVGj2w+aN0zn3k= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 h1:zSDPny/pVnkqABXYRicYuPf9z2bTqfH13HT3v6UheIk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14/go.mod h1:3TTcI5JSzda1nw/pkVC9dhgLre0SNBFj2lYS4GctXKI= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12 h1:tzha+v1SCEBpXWEuw6B/+jm4h5z8hZbTpXz0zRZqTnw= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12/go.mod h1:n+nt2qjHGoseWeLHt1vEr6ZRCCxIN2KcNpJxBcYQSwI= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.1 h1:xQv1YON3lQ/1YKM9LXQ1KYddz3xec93OSk0cPmY7BGE= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.15.1/go.mod h1:hZAlj3tvGG9afdu1J1fEuiAsGHL/nzYhzjlOFojJ2AM= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.1 h1:tUAfCwMmFEXX1i74o+BTvd2Xr0iU1eqnnJ/8jIr1lZs= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.13.1/go.mod h1:AJOtOziOUyo94xRigSdj1pjB8lrtegZTMiw4NkA2rqU= +github.com/aws/aws-sdk-go-v2/service/kafka v1.34.1 h1:AgBv2EgMXguYPz1fpSyj51JuC6vXGNP0Wz3NNeHQLog= +github.com/aws/aws-sdk-go-v2/service/kafka v1.34.1/go.mod h1:/iV7HuLjhE4JD+xswkqjipO9tv7EPUbO+1QlaxB6BTA= +github.com/aws/aws-sdk-go-v2/service/kendra v1.51.1 h1:RfQPkqz555MsIkD0i0XIUQlj12QQ9ij+GI/NW9Pu3sw= +github.com/aws/aws-sdk-go-v2/service/kendra v1.51.1/go.mod h1:nwwYQj97ME0q/3Ak01ABehQiLqupYNI24pfxT9cIMuA= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.1 h1:eMMWq0lgwP++zZVZ/K+W2Zx3fnbjUYFsDgFyXGus4ts= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.11.1/go.mod h1:zddI8paRYz+rwAu/0jBwGANi8rV3dk7Pcyj/trdu/N8= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.1 h1:kKV5YQgCYvyOHf2Fw7UZsXOiR4J82rS4uNhvNtk5YDA= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.28.1/go.mod h1:mCOLFKtbzhBey1ZcvC5Vd8bp7Lo40VCLJzDJjP6iGOY= +github.com/aws/aws-sdk-go-v2/service/kms v1.34.1 h1:VsKBn6WADI3Nn3WjBMzeRww9WHXeVLi7zyuSrqjRCBQ= +github.com/aws/aws-sdk-go-v2/service/kms v1.34.1/go.mod h1:5F6kXrPBxv0l1t8EO44GuG4W82jGJwaRE0B+suEGnNY= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.1 h1:nQrZAsHVBVQRB7aJ6/f7a7u/DVaWu15HiWWJTEFJSpU= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.34.1/go.mod h1:vZzOCXUmJE5S2FgqCy7GOReT6b6riPfdS+wps2gwQlk= +github.com/aws/aws-sdk-go-v2/service/lambda v1.55.1 h1:Drh1jXr7mTcSXyjEgCIMijskUz/5FXgdjJcqXGQnjhs= +github.com/aws/aws-sdk-go-v2/service/lambda v1.55.1/go.mod h1:5drdANY67aOvUNJLjBEg2HXeCXkk0MDurqsJs73TXVQ= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.1 h1:SkoH8/0+c53BBHAsjoZXJoZy0EdmnOb4cUhMxn8BQR4= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.5.1/go.mod h1:2P/sUIiKxD3ohzL1CgjLDZnOksgIDUDffU7z54Ul1tA= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.1 h1:pQuAnpqqsmBAALIN7W4sn06zV6Qv9PMbfeJ3imaGX4Y= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.44.1/go.mod h1:DACyUyjpYCDpjEE/3px9kWeIr8vC0SNyORyaSru35DQ= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.1 h1:OIdINTNLFOqm7t91ew7+CgcIkvDCCTuK4rBuREBAC2Q= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.39.1/go.mod h1:nP29+6YQpLvD/o/8SXaaSVFdRdPCpLLZv6MVAFiPqIQ= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.1 h1:ImufVLN7bEElrVC05pkpZqw6eYiHX6KFFO9iWqUEzhc= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.28.1/go.mod h1:Kbb0YMyrxzk1zlYncMv4/afaB0KvQWDiRFT9vuVpUGQ= +github.com/aws/aws-sdk-go-v2/service/m2 v1.14.1 h1:oOStgQy7APtRye8/QWEKaY+rL1xASmFYJtPjjYtIHMs= +github.com/aws/aws-sdk-go-v2/service/m2 v1.14.1/go.mod h1:YxWYSbAEqBGH03gk0jcobKzW6Kq0yd2N08PdoxEsgTg= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.1 h1:6tFXjY3Lz997P+k0zHVoSRxJdkzTOc8Ns2RRtGeFKg4= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.29.1/go.mod h1:s7Som/VmhvLO1c2ODsd6VelNFoDvzy0ZpWAcVmnLTnE= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.1 h1:Ipwvv5Mot7I/ofXBNsM05LUZfEHKWrdqFH6EaVrom2U= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.56.1/go.mod h1:cf2y51+iaui3t0evj14KJibqFP4kMqFuNRIa9huKEsw= +github.com/aws/aws-sdk-go-v2/service/medialive v1.53.1 h1:z/OtXeoNPytEQXEklZ/79rM5dLRtFaqwri/9vCItY2Y= +github.com/aws/aws-sdk-go-v2/service/medialive v1.53.1/go.mod h1:NVacuK6xVc9bKwz4CsVcD20aY7F9Y9BZ4WG0TFZimhg= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.1 h1:qpO+Oc7bKrc7+fvU5O7sFnB4s0CND/6Fv8M7yvMal08= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.31.1/go.mod h1:kfUZB7t0Yqho3G49zepbeCFSQgTnUTHuyMGCOu8RQOc= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.1 h1:avU2E/Yu+4SrcV9Nb7M4ifdjGiXRR7nJx4FvfO3YL4M= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.13.1/go.mod h1:v83XUctBgyBJnYoHykOj3YsRNnzK8LlHGyS5HJoBIzU= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.1 h1:SU4k8WNXxRUQgmAmtiwHJTsJiPLZ1ItN93vef2+D5KM= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.21.1/go.mod h1:z1b7kZLDuNTSrUbA/mDLaRJ2ivlTjqr0H4aoBx6x7PU= +github.com/aws/aws-sdk-go-v2/service/mq v1.23.1 h1:TcIIYgAH1voIS33mcUFIdts9qJ4+mzGbnHExAzmjNPM= +github.com/aws/aws-sdk-go-v2/service/mq v1.23.1/go.mod h1:qo6k2hLt3/Oi0fTndXhdMCg005TzoqT313YrYMorrNI= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.1 h1:fzBc0gfOfrlcyP/COVDt8iGVUnQ4FX/qaasEAUeDLy0= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.28.1/go.mod h1:a46hMp6jog7U6rhMxmp0wwcGvPTJINQkc6EevZb7SNs= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.1 h1:UjByGYRBlhjY4l8Lun62K3Z62Wks84q3UasnDDJoz5I= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.9.1/go.mod h1:5q3YTQennpO1/KB7rU71vW/9PjLC4PuosEi2xDEw5OY= +github.com/aws/aws-sdk-go-v2/service/oam v1.12.1 h1:LZrULRkfrmZVE8OHqwI8tKFEFxpjZl6ll7Bn2MCCVwg= +github.com/aws/aws-sdk-go-v2/service/oam v1.12.1/go.mod h1:yiUaEYA1zVxtz/EGgf8NE7rT56sLKGqQwQrWg/GhGu8= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.1 h1:BRAM7tTwHJojSOhiyUkPh2Z/hOco7OkayTf6MYFOF5w= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.12.1/go.mod h1:JhHI5YxjlRL5IqQPcijTGs8e7B0mVLLk1fpssVqjZaY= +github.com/aws/aws-sdk-go-v2/service/organizations v1.28.1 h1:dfjBY/IdKIGBvE46uNHYFW9csLGt683je80+fAFiLmw= +github.com/aws/aws-sdk-go-v2/service/organizations v1.28.1/go.mod h1:asny2SDsK1rwPKbuQ+s8f5y1hWpYenP4CqsxOymkudc= +github.com/aws/aws-sdk-go-v2/service/osis v1.11.1 h1:PvMmCkbmm6+IaStuc45PjM/IykBDYUHnJQBMCLJwWsk= +github.com/aws/aws-sdk-go-v2/service/osis v1.11.1/go.mod h1:RBQgmsqEtnAxY9OVxzJkFVRQ0u1l6+SLtAw4HpjpKwE= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.1 h1:F/5ouMfQxLkRO53C8HVHFuOzMmugJEXJpgFuft9noyA= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.11.1/go.mod h1:VHsagvynhabHbLl4DtdjtWQ8GgmZl6qw/Sc4ix78QWs= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.1 h1:QdWiKfoRzXamzsL/ejbnWI/bPrtHDmoxAnqLD5h2Qwg= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.6.1/go.mod h1:heR4dYebTI0Gcj2jn6OK8m/She92XlTGexlkG+CSkcI= +github.com/aws/aws-sdk-go-v2/service/pipes v1.13.1 h1:nDGPNXJPc/Zyjdenbkmfe8+qJaXy16R0CCZNpAJzsYk= +github.com/aws/aws-sdk-go-v2/service/pipes v1.13.1/go.mod h1:98vnplOvsabKozsg0U14ges5xzrrVAkK+0fkc29WxFY= +github.com/aws/aws-sdk-go-v2/service/polly v1.41.1 h1:+hSr0DpeXsDLIUzQy9Mtc0MHr+RWj5fwLTBVr/OkUeo= +github.com/aws/aws-sdk-go-v2/service/polly v1.41.1/go.mod h1:SoN8AjKOVVC/pBAa6CsFaqqEKAF3ZIuG6iTW3XkQm/Y= +github.com/aws/aws-sdk-go-v2/service/pricing v1.29.1 h1:IwnxNjvhqtPQNNW93xBVTzRKJ3BI9GSEDu1w+YMXfUI= +github.com/aws/aws-sdk-go-v2/service/pricing v1.29.1/go.mod h1:yZMXOzGy2QtzacpvpWaptEuYXWoFcINn04FUjnNn39w= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.1 h1:xHupkKEZm928HDycbYl7WBMNYuDzPOJ+sR8UL/B32rM= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.7.1/go.mod h1:EU7zeEUzGV+vjgr9IjhW5QhjlgY5s7wjBsvpD1XCZbE= +github.com/aws/aws-sdk-go-v2/service/qldb v1.22.1 h1:gpLL+eTaS4W3jVH88x811rgYLbUeGdtKenQgvZA6nBk= +github.com/aws/aws-sdk-go-v2/service/qldb v1.22.1/go.mod h1:zd8pWnlLZxx2dk3k1ekl9WJOdTZW0v10+lZnPUFztLs= +github.com/aws/aws-sdk-go-v2/service/ram v1.26.1 h1:1UcUsMsHB7ZnpcUYNwBTX90hFjIZrhf8Xu00R9Vo+Kg= +github.com/aws/aws-sdk-go-v2/service/ram v1.26.1/go.mod h1:e/3wE+afnOAeolpqyg8fKAQK/kKya+ycDW62/X4vjK8= +github.com/aws/aws-sdk-go-v2/service/rbin v1.17.1 h1:lQRI9dPRfnj8s57U52zoxia7k61brR+0AoTylUnlHMA= +github.com/aws/aws-sdk-go-v2/service/rbin v1.17.1/go.mod h1:K4NSpziaXU08Y9AWCbnq6hP+wFRSlqYCTI15CBWM/bA= +github.com/aws/aws-sdk-go-v2/service/rds v1.80.1 h1:o0DyV3AWeuAwrBVeoW/kCZJi4oGCBHPS3E5Ppmc3fLE= +github.com/aws/aws-sdk-go-v2/service/rds v1.80.1/go.mod h1:lmaCww9B42S2WBaJNa5v+HeRpoGO+9gO+SwYJtNV8mw= +github.com/aws/aws-sdk-go-v2/service/redshift v1.45.1 h1:AdnF43k4XVzTTtVXtqyy2v20RiptDLmUX7ZuokdF5I0= +github.com/aws/aws-sdk-go-v2/service/redshift v1.45.1/go.mod h1:3S2IEN/LSwonlc30Hoyu06jBj/YOz6m+uHffkCJ2D3o= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.1 h1:QOxr2Mgm2O4Syt7ROT2UCNDVPvcEjoBW/5DnlWw3GAc= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.26.1/go.mod h1:z1qDE+l45V0J/hAmZ8d9cO5MY207kz5YH6o3kVB2quk= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.1 h1:VRAjP3iJ684rhGmZ1LRy+8SARfnfrOB6NeT9XaccflA= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.19.1/go.mod h1:+b6LJEQpqKMBA7Jw1fgpWngaZWiJtYGHtW4mm3awuos= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.1 h1:BsFFOLs6CTuzC8dxiAtrdtw8sjCoJydGiLXKPVjK1bg= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.41.1/go.mod h1:Tjh59zYOtIXSVQpJMxIWqkj/SONo8Crc0s6Z6CjBG1w= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.1 h1:o2MkvVZAahZX3ttqVmJJeCRAmIHQ98iJsLlmHXFjuCM= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.11.1/go.mod h1:Hq2k/Ovak4zs70o1r39jzn+jOfwsBaWYq79KY5ntvH4= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.1 h1:aR4MioMW7hiNGTcoz8rngzPF7U4oBssCr/N7oaNyr30= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.23.1/go.mod h1:gCiBxW2zE+VgC/gSU5a0gteSBjqo3uS906dLJoQgItw= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1 h1:73im9DnuBD4+G8hHsbqb0NSA+n6QJ5ApFk6/YeOz8k8= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1/go.mod h1:p5FuKT8Rj4fnlT84Pzy7itV11NZ39Fwm/Y52S8Lg1Oc= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.1 h1:jdwVopS0EMYP6xs/BxSW6iOkchLUHI4Le93HEMX5v8A= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.12.1/go.mod h1:cPPSRXGdLg1+Fguh3QNNOyXfic3QtIQllMs+GAIX5ic= +github.com/aws/aws-sdk-go-v2/service/route53 v1.41.1 h1:8evgBTGIqkBj8zWFZrjBExvC1/3Bgod5EHsmwmnHEy4= +github.com/aws/aws-sdk-go-v2/service/route53 v1.41.1/go.mod h1:aIGJVylrqjjBnf2NU2O1oHOOoBDFvHw6hy/GhelYksQ= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.1 h1:G1w6P2mCgHTsLLjiUAADion/UFrbeSMEAiIpuQZnXQs= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.24.1/go.mod h1:c9sryrQoAKXDmxmV4D+5Tfcczro2hDyt93xqoht4KeM= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.1 h1:TK06zMXS9HYhqlBogMcUKorOl/13WaYtu0iD+6PQeJI= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.1.1/go.mod h1:cIiUrh4zaUDalfCK/INCBLTrM+RrISQioyShnlQPy58= +github.com/aws/aws-sdk-go-v2/service/rum v1.18.1 h1:YvOEWP/vJSdtWOzJ6JVkdUNBMb0pGuCaKtFMQ1pT0uQ= +github.com/aws/aws-sdk-go-v2/service/rum v1.18.1/go.mod h1:SRAqBhlI73DxLJk++4NzMaTk08X8Ko1cTmLxo6Jencs= +github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 h1:wsg9Z/vNnCmxWikfGIoOlnExtEU459cR+2d+iDJ8elo= +github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1/go.mod h1:8rDw3mVwmvIWWX/+LWY3PPIMZuwnQdJMCt0iVFVT3qw= +github.com/aws/aws-sdk-go-v2/service/s3control v1.45.1 h1:ZLpS2OLxDU5kJmsORex4Iyd/1v386lW6U6tI3dg38yU= +github.com/aws/aws-sdk-go-v2/service/s3control v1.45.1/go.mod h1:D3MZ3krIqgoG3twJxe/NfHatuUiQ+Qp76TEqrX7K4pY= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.1 h1:A46/5P4BsP3XUqm+ehaa3GzdqSUm63hElZkZjv60pto= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.9.1/go.mod h1:YR4bk2KhPbe9Ryes7kRZ/U3kRX6DdfS6xFfUc7RGj5Q= +github.com/aws/aws-sdk-go-v2/service/schemas v1.25.1 h1:2qFVrrqZxRQVxuZ/2nnpLvm9mRAELSQWczpbt7oR62c= +github.com/aws/aws-sdk-go-v2/service/schemas v1.25.1/go.mod h1:kyEvFeyc6CvoylCMY2yXBWnsqKs3TLc3QY2Bt70Wk2A= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1 h1:fMhrWVym3nTAcf3eT9XsYcfN1kgQ/7ZuVLGHjPAn6Ms= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.31.1/go.mod h1:tBCf2+VgRT/Lk9KIlKpTxyCunzxHcP8BFPqcck5I9mM= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.1 h1:kT/0nz4Fgb7/xZpIUubXmFrNQHQ4KPaBA2ebGGCE2F4= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.50.1/go.mod h1:0eCNhMYahG4Yj7uBDm9BTq8KoLmBmhxt4d36PfZ/uPU= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.1 h1:vTyA6riZZ7n7qI0vlNHaXgqv8D5oiRCuHwEj1gd1soM= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.15.1/go.mod h1:GPJabMy3AdBJjL6YRzu3LNbw+11OuvzZwjmMpmZhkjg= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.1 h1:WJR9PhUdNULh+L+C/ByCFFB8ldkTfj4c9HKiWV+esgk= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.27.1/go.mod h1:VHl0eZ8oYU2D0/BeBYTO5bJ6V1riuxCBQGEAjF+6Jx0= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.1 h1:N19/J0IqsoNlkbXLe+JYWLjOyGmRijt6dw0+MaL/9wE= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.30.1/go.mod h1:uuMsqZ2ATDqrzaAldWWuEUd9KGqi1NmnjroG6Eoe7W4= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1 h1:QsHvqtdy0mGzpg/A+1lZX1ilf05Vuh2rSBzNJ3f3T1I= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1/go.mod h1:PyGv4oTed21K85Eu27j4u/8QyMlMHI0MivoNzziG6fg= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.1 h1:Bz5SPXOgdFOs0y+zt0KoqyAweD6UrOSQ0trsLCulttQ= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.31.1/go.mod h1:uwzHo1t7tjKs3mo+X9wAMis1rCp23oGR4zXfKROKv28= +github.com/aws/aws-sdk-go-v2/service/shield v1.26.1 h1:vlqoPRFrhs/djRKnrPNJvzzVLIsMWITGgP4gHIzprSU= +github.com/aws/aws-sdk-go-v2/service/shield v1.26.1/go.mod h1:1aUTOI7FTFp3ng7NH3C0UqDkbofoLb7NLcd/ufvlHdY= +github.com/aws/aws-sdk-go-v2/service/signer v1.23.1 h1:H91003y5gB7UfahQ58w6GeMZfiNPTxTarpNj8fAJvfc= +github.com/aws/aws-sdk-go-v2/service/signer v1.23.1/go.mod h1:KaQ1Ix0kfyv+PTMN9u3/+VRUeAMi59yzMpTkbQPXNr0= +github.com/aws/aws-sdk-go-v2/service/sns v1.30.1 h1:49R5Uh0Vi4Y21UHfLzmLmg7hwqQLyBmWqS0Vh+EpV2A= +github.com/aws/aws-sdk-go-v2/service/sns v1.30.1/go.mod h1:khPCTZaFImcuDtOLDqiveVdpQL53OXkK+/yoyao+kzk= +github.com/aws/aws-sdk-go-v2/service/sqs v1.33.1 h1:m/7a5OgAZQDWJlSbZLWg4BAlbXbY6j+dDDjPY8rZ7kA= +github.com/aws/aws-sdk-go-v2/service/sqs v1.33.1/go.mod h1:4kCM5tMCkys9PFbuGHP+LjpxlsA5oMRUs3QvnWo11BM= +github.com/aws/aws-sdk-go-v2/service/ssm v1.51.1 h1:MuFdaoXYgw4CPsiSa2G/T5CGOuSk90lb/eSTa+lRp9I= +github.com/aws/aws-sdk-go-v2/service/ssm v1.51.1/go.mod h1:pC8vyMIahlJIUKdXBto0R+JzoTK7+iEplKqq7DbWodY= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.1 h1:a8tzj/cicbel7pGZYjF3JOJRtyLeWYPCzqL2Plr7LM4= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.23.1/go.mod h1:LBJz2C528vpvnKXpS1lW139rq7ZYnRPkTgm1RcewafU= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.1 h1:I1k+UQhRcltDoFauDzAnYsKiXKlE6ZNYzsn7PbMpN/o= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.31.1/go.mod h1:Qi+hKH0d2ekPABDWOkiVWkHnpZiWqhbiVhh/MasyRPo= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.1 h1:Fo7XgyYfeEqzCeAxUvefMJneqoL689TSclyB6SzcAWE= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.14.1/go.mod h1:Pvu3mUuN20em83awAVvDXGvlTlZ40nw283BOrWG6EYI= +github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 h1:sd0BsnAvLH8gsp2e3cbaIr+9D7T1xugueQ7V/zUAsS4= +github.com/aws/aws-sdk-go-v2/service/sso v1.21.1/go.mod h1:lcQG/MmxydijbeTOp04hIuJwXGWPZGI3bwdFDGRTv14= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.1 h1:IB7M3gfihqPbP4oXGenFluKta7S2OWMU5otcvclmA0w= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.26.1/go.mod h1:N/A1nm/r9ruAvskqhfpLEymbJtLJQV1s4HR9Mn8JUnY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1 h1:1uEFNNskK/I1KoZ9Q8wJxMz5V9jyBlsiaNrM7vA3YUQ= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1/go.mod h1:z0P8K+cBIsFXUr5rzo/psUeJ20XjPN0+Nn8067Nd+E4= +github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 h1:myX5CxqXE0QMZNja6FA1/FSE3Vu1rVmeUmpJMMzeZg0= +github.com/aws/aws-sdk-go-v2/service/sts v1.29.1/go.mod h1:N2mQiucsO0VwK9CYuS4/c2n6Smeh1v47Rz3dWCPFLdE= +github.com/aws/aws-sdk-go-v2/service/swf v1.24.1 h1:5SKFgvzgDg00ML7tvbxgahJf/2hei+Y+CBFLhcKGdTE= +github.com/aws/aws-sdk-go-v2/service/swf v1.24.1/go.mod h1:pFCXXy2Q3UFWoAzZaZ1Hha+sV7+vSV7PMc1bfhn/frM= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.1 h1:It6Hgms3aJvkldek7bAgatZX59x2ORMF1WRnoCvOBE4= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.25.1/go.mod h1:YX/Ra26SfE8jG/qhzVUH67snS1e/ipvk+g0deQiKznU= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.1 h1:DKIdl+mjQdvpT+UxQqdJzagpVi/byLd86+LqVa5lrfs= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.1.1/go.mod h1:QBXvMbzNfHCVQ1pPiJ3VfIvYQ2Lakda/CDjs2eyFVus= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.1 h1:zmrL3QlVMeFFoSY7eeTxvyVkvXwbzH+4CkNk+IcCQ6c= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.26.1/go.mod h1:3c9FWFZFRg26pEXRBa9hJ7z7kFmfJZLOM3IvfO0QcDs= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.1 h1:KzLj8Ndp0FW7CWo/r53IMhZ9EBo7xKvqYONf8B81hzQ= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.38.1/go.mod h1:lTU0fIPy0DJqbtogTN+QlxFPJZGHrBW+GJuhVbLAsd0= +github.com/aws/aws-sdk-go-v2/service/transfer v1.49.1 h1:qtw+AYR7f9UggfBqz7gUntNOk+UWh3zdYdcSWDwKXL8= +github.com/aws/aws-sdk-go-v2/service/transfer v1.49.1/go.mod h1:GlVT65BhLN/ia7JsqqUHcLGamdRDLRJgG+OidHKnqbI= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.1 h1:d+8Gw9BYBXV3NirQNHLOSS3jC5SAI2s83rmaPKExqiA= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.16.1/go.mod h1:18uGZxP22gTNTF7s3Hytn5a38uGwKbKV/twAlF5RGrU= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.1 h1:wgOGWcWNKmEpKBwDWGZAz9svWXelZb3AXhPho+k3gHs= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.9.1/go.mod h1:rx5U6Ai/YvQkHmufCxvqqA1edhy4/B7TDtgj6IcRlPM= +github.com/aws/aws-sdk-go-v2/service/waf v1.22.1 h1:tThCZniinFeLPAoazNu7mim/ipCKZKIjT2UZrxUQcQU= +github.com/aws/aws-sdk-go-v2/service/waf v1.22.1/go.mod h1:4o8nB9c6IGaAzCdx9maPjeKpwAVzEy3f/6yQtbEoBTs= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.1 h1:au7mSQqu+gxxQuG1P0YCgM0w0OP4Sk7rReHVWtua+dY= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.22.1/go.mod h1:wI+EyfF4sTj905uEIaSiflGusqxkizZ8BEsfjgglmCE= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.1 h1:cp9UYbI4IOMNczk/1PeGkUWfZH5xbdPGBgVVJs4MvgE= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.50.1/go.mod h1:LKpRTYGj4TQXkDRIdcH6U/BdiVSh+IPmXExACuDK+nQ= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.1 h1:CzuwkrjJx71qGieDJofWaXlGXo7rBqbaC+sbaiuGo/M= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.31.1/go.mod h1:/nDTaO0dBchAbqwQrPFl81YyuxR8KLcJP67XzIIOrbg= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.1 h1:B3Y0d+jwez16NFDUGmEhXhx96EuwH07ERfHyMCjwDEQ= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.40.1/go.mod h1:u1LDClOljTCdY66v1x8jRqAzqr7f2tYSPbaOv+40PKM= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.1 h1:1XvY5lu415RgtZjBRI/X3RtIg4rlmJCGVBa1g6UWNTs= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.19.1/go.mod h1:9OLCaeqeG3cHCH1RoADMg3n0dQjxzbxwfxmKM+ALcl4= +github.com/aws/aws-sdk-go-v2/service/xray v1.26.1 h1:HYDnKTBHT0bDROhdSvrBOWO/hR3dk4zvQBxs1Hy8HsY= +github.com/aws/aws-sdk-go-v2/service/xray v1.26.1/go.mod h1:hzagwUFkLbUYjoG391sGdiWWfZacwrwp5GZQQLz1sxg= github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/beevik/etree v1.4.0 h1:oz1UedHRepuY3p4N5OjE0nK1WLCqtzHf25bxplKOHLs= From 087246188f019c0ce58d4809076a4d2f55b3a291 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 11:04:44 -0400 Subject: [PATCH 206/208] appsync: Tidy up acceptance test configurations. --- .../domain_name_api_association_test.go | 17 +++--- internal/service/appsync/domain_name_test.go | 6 +- internal/service/appsync/resolver_test.go | 58 +++++++++---------- 3 files changed, 39 insertions(+), 42 deletions(-) diff --git a/internal/service/appsync/domain_name_api_association_test.go b/internal/service/appsync/domain_name_api_association_test.go index f119e6deb47..f7a1b6d1c89 100644 --- a/internal/service/appsync/domain_name_api_association_test.go +++ b/internal/service/appsync/domain_name_api_association_test.go @@ -23,14 +23,13 @@ func testAccDomainNameAPIAssociation_basic(t *testing.T) { ctx := acctest.Context(t) var association awstypes.ApiAssociation appsyncCertDomain := acctest.SkipIfEnvVarNotSet(t, "AWS_APPSYNC_DOMAIN_NAME_CERTIFICATE_DOMAIN") - rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name_api_association.test" resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), - ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDomainNameAPIAssociationDestroy(ctx), Steps: []resource.TestStep{ { @@ -62,14 +61,13 @@ func testAccDomainNameAPIAssociation_disappears(t *testing.T) { ctx := acctest.Context(t) var association awstypes.ApiAssociation appsyncCertDomain := acctest.SkipIfEnvVarNotSet(t, "AWS_APPSYNC_DOMAIN_NAME_CERTIFICATE_DOMAIN") - rName := sdkacctest.RandString(8) resourceName := "aws_appsync_domain_name_api_association.test" resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), - ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDomainNameAPIAssociationDestroy(ctx), Steps: []resource.TestStep{ { @@ -131,10 +129,9 @@ func testAccCheckDomainNameAPIAssociationExists(ctx context.Context, n string, v } } -func testAccDomainNameAPIAssociationBaseConfig(domain, rName string) string { - return acctest.ConfigAlternateRegionProvider() + fmt.Sprintf(` +func testAccDomainNameAPIAssociationConfig_base(domain, rName string) string { + return fmt.Sprintf(` data "aws_acm_certificate" "test" { - provider = "awsalternate" domain = "*.%[1]s" most_recent = true } @@ -152,16 +149,16 @@ resource "aws_appsync_graphql_api" "test" { } func testAccDomainNameAPIAssociationConfig_basic(domain, rName string) string { - return testAccDomainNameAPIAssociationBaseConfig(domain, rName) + ` + return acctest.ConfigCompose(testAccDomainNameAPIAssociationConfig_base(domain, rName), ` resource "aws_appsync_domain_name_api_association" "test" { api_id = aws_appsync_graphql_api.test.id domain_name = aws_appsync_domain_name.test.domain_name } -` +`) } func testAccDomainNameAPIAssociationConfig_updated(domain, rName string) string { - return testAccDomainNameAPIAssociationBaseConfig(domain, rName) + fmt.Sprintf(` + return acctest.ConfigCompose(testAccDomainNameAPIAssociationConfig_base(domain, rName), ` resource "aws_appsync_graphql_api" "test2" { authentication_type = "API_KEY" name = "%[1]s-2" diff --git a/internal/service/appsync/domain_name_test.go b/internal/service/appsync/domain_name_test.go index 82caf10328a..36710ed83f7 100644 --- a/internal/service/appsync/domain_name_test.go +++ b/internal/service/appsync/domain_name_test.go @@ -30,7 +30,7 @@ func testAccDomainName_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), - ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDomainNameDestroy(ctx), Steps: []resource.TestStep{ { @@ -60,7 +60,7 @@ func testAccDomainName_description(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), - ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDomainNameDestroy(ctx), Steps: []resource.TestStep{ { @@ -96,7 +96,7 @@ func testAccDomainName_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.AppSyncEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.AppSyncServiceID), - ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDomainNameDestroy(ctx), Steps: []resource.TestStep{ { diff --git a/internal/service/appsync/resolver_test.go b/internal/service/appsync/resolver_test.go index b43cf827dd1..300dcef8cbe 100644 --- a/internal/service/appsync/resolver_test.go +++ b/internal/service/appsync/resolver_test.go @@ -446,7 +446,7 @@ resource "aws_appsync_datasource" "test" { } func testAccResolverConfig_basic(rName string) string { - return testAccResolverConfig_base(rName) + ` + return acctest.ConfigCompose(testAccResolverConfig_base(rName), ` resource "aws_appsync_resolver" "test" { api_id = aws_appsync_graphql_api.test.id field = "singlePost" @@ -472,11 +472,11 @@ EOF #end EOF } -` +`) } func testAccResolverConfig_dataSource(rName string) string { - return testAccResolverConfig_base(rName) + ` + return acctest.ConfigCompose(testAccResolverConfig_base(rName), ` resource "aws_appsync_datasource" "test2" { api_id = aws_appsync_graphql_api.test.id name = "test_ds_2" @@ -512,14 +512,14 @@ EOF #end EOF } -` +`) } func testAccResolverConfig_dataSourceLambda(rName string) string { - return testAccDatasourceConfig_baseLambda(rName) + fmt.Sprintf(` + return acctest.ConfigCompose(testAccDatasourceConfig_baseLambda(rName), fmt.Sprintf(` resource "aws_appsync_graphql_api" "test" { authentication_type = "API_KEY" - name = %q + name = %[1]q schema = < Date: Thu, 20 Jun 2024 11:10:13 -0400 Subject: [PATCH 207/208] appsync: Custom API client factory. --- internal/service/appsync/service_package.go | 41 +++++++++++++------ .../service/appsync/service_package_gen.go | 22 ---------- names/data/names_data.hcl | 1 + 3 files changed, 30 insertions(+), 34 deletions(-) diff --git a/internal/service/appsync/service_package.go b/internal/service/appsync/service_package.go index 53db884512f..b64f2619042 100644 --- a/internal/service/appsync/service_package.go +++ b/internal/service/appsync/service_package.go @@ -6,21 +6,38 @@ package appsync import ( "context" - aws_sdkv1 "github.com/aws/aws-sdk-go/aws" - request_sdkv1 "github.com/aws/aws-sdk-go/aws/request" - appsync_sdkv1 "github.com/aws/aws-sdk-go/service/appsync" - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws/retry" + "github.com/aws/aws-sdk-go-v2/service/appsync" + awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/names" ) -// CustomizeConn customizes a new AWS SDK for Go v1 client for this service package's AWS API. -func (p *servicePackage) CustomizeConn(ctx context.Context, conn *appsync_sdkv1.AppSync) (*appsync_sdkv1.AppSync, error) { - conn.Handlers.Retry.PushBack(func(r *request_sdkv1.Request) { - if r.Operation.Name == "CreateGraphqlApi" { - if tfawserr.ErrMessageContains(r.Error, appsync_sdkv1.ErrCodeConcurrentModificationException, "a GraphQL API creation is already in progress") { - r.Retryable = aws_sdkv1.Bool(true) +// NewClient returns a new AWS SDK for Go v2 client for this service package's AWS API. +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*appsync.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) + + return appsync.NewFromConfig(cfg, func(o *appsync.Options) { + if endpoint := config[names.AttrEndpoint].(string); endpoint != "" { + tflog.Debug(ctx, "setting endpoint", map[string]any{ + "tf_aws.endpoint": endpoint, + }) + o.BaseEndpoint = aws.String(endpoint) + + if o.EndpointOptions.UseFIPSEndpoint == aws.FIPSEndpointStateEnabled { + tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") + o.EndpointOptions.UseFIPSEndpoint = aws.FIPSEndpointStateDisabled } } - }) - return conn, nil + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if errs.IsAErrorMessageContains[*awstypes.ConcurrentModificationException](err, "a GraphQL API creation is already in progress") { + return aws.TrueTernary + } + return aws.UnknownTernary // Delegate to configured Retryer. + })) + }), nil } diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index 95e1d556b3a..1fd057df4bc 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -5,9 +5,6 @@ package appsync import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appsync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appsync" - "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -84,25 +81,6 @@ func (p *servicePackage) ServicePackageName() string { return names.AppSync } -// NewClient returns a new AWS SDK for Go v2 client for this service package's AWS API. -func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*appsync_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) - - return appsync_sdkv2.NewFromConfig(cfg, func(o *appsync_sdkv2.Options) { - if endpoint := config[names.AttrEndpoint].(string); endpoint != "" { - tflog.Debug(ctx, "setting endpoint", map[string]any{ - "tf_aws.endpoint": endpoint, - }) - o.BaseEndpoint = aws_sdkv2.String(endpoint) - - if o.EndpointOptions.UseFIPSEndpoint == aws_sdkv2.FIPSEndpointStateEnabled { - tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - o.EndpointOptions.UseFIPSEndpoint = aws_sdkv2.FIPSEndpointStateDisabled - } - } - }), nil -} - func ServicePackage(ctx context.Context) conns.ServicePackage { return &servicePackage{} } diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl index 63f98e2e126..3880af55ab7 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -707,6 +707,7 @@ service "appsync" { client { go_v1_client_typename = "AppSync" + skip_client_generate = true } endpoint_info { From baa3ebf3eb3aee75d0b90024e9fa0a67e4b7c33e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jun 2024 12:22:27 -0400 Subject: [PATCH 208/208] r/aws_appsync_graphql_api: Fix 'InvalidParameterValueException: The runtime parameter of nodejs14.x is no longer supported for creating or updating AWS Lambda functions. We recommend you use the new runtime (nodejs20.x) while creating or updating functions'. --- internal/service/appsync/graphql_api_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/appsync/graphql_api_test.go b/internal/service/appsync/graphql_api_test.go index 079c396ca96..cf2ddcd7a0a 100644 --- a/internal/service/appsync/graphql_api_test.go +++ b/internal/service/appsync/graphql_api_test.go @@ -1573,7 +1573,7 @@ resource "aws_lambda_function" "test" { function_name = %[1]q handler = "lambdatest.handler" role = aws_iam_role.test.arn - runtime = "nodejs14.x" + runtime = "nodejs20.x" publish = true }